fixed a bug with pagination and the facets cape
Merge branch 'master' of https://github.com/EEXCESS/hackathon

Conflicts:
	common_js/searchResultList.js
merge