Merge pull request #48 from alexivanov84/branch#9

fix pages
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
new changes
Merge pull request #49 from alexivanov84/_aro_new

new changes
Merge origin/master
upload image for user