Fix docs
Change $watches to be 1.2.x compatible
Merge remote-tracking branch 'remotes/upstream/3.0-paging' into 3.0-paging

Conflicts:
	src/features/paging/js/ui-grid-paging.js