Moving changes to CHANGELOG.md
Merge branch '2.0.6' of https://github.com/angular-ui/ng-grid into 2.0.6

Conflicts:
	CHANGELOG.md