Paginator completed with angular
Merge branch 'master' of github.com:ONSdigital/tredegar

Conflicts:
	src/main/resources/files/ui/js/angular/controllers.js