Merge branch 'master' of https://github.com/alexivanov84/isiscms into branch#9

Conflicts:
	cp/themes/constellation/layout/css/custom.css