t
Merge branch 'master' of https://github.com/dgordienko/angular_test

Conflicts:
	.idea/workspace.xml
ng-grid