CLSN-1252 move ng-grid to directive
CLSN-1106 move ng-grid to v2.0.11
app.config, web.config commit
Merge branch 'master' of https://github.com/algosystech/collosys

Conflicts:
	FileUploaderTest/app.config