quick custom change
Merge branch 'master' of https://github.com/rizanc/ng-grid

Conflicts:
	src/classes/eventProvider.js