Total Server Items Fix#369

keithharvey wants to merge 2 commits intoangular-ui:masterangular-ui/ui-grid:masterfrom

keithharvey:masterkeithharvey/ng-grid:masterCopy head branch name to clipboard