removing whitespace
fixing revert
fixing revert
fixing revert
Merge branch 'feature-bs3-collections' of
https://github.com/ten24/Slatwall into feature-bs3-collections

Conflicts:
	admin/client/slatwalladmin/js/directives/pagination.js
	admin/client/slatwalladmin/js/directives/partials/paginationBar.html