fix pages
Merge branch 'master' of https://github.com/alexivanov84/isiscms

Conflicts:
	cp/themes/constellation/pages/scripts/custom.js
Merge branch 'master' of https://github.com/alexivanov84/isiscms

Conflicts:
	cp/themes/constellation/pages/scripts/custom.js