Fixed console errors
Merge branch '2.x' of https://github.com/vinay-k/ng-grid into 2.x

Conflicts:
	build/ng-grid.js