Remove ngGrid from app.js dependencies
Merge branch 'hotFix' into dev

Conflicts:
	public/dist/app.js