Merge branch 'pagination_reload_fix' of https://github.com/aheys/ng-t…

…able into pagination_reload_fix

Conflicts:
	dist/ng-table.js
	dist/ng-table.min.js
	dist/ng-table.min.js.map
	src/scripts/ngTableParams.js