video upload functionality
shop module
Merge pull request #44 from alexivanov84/_aro_

shop module
Merge origin/branch#9

Conflicts:
	cp/themes/constellation/layout/css/custom.css
social wizard 3-rd step
Merge branch 'master' of https://github.com/alexivanov84/isiscms into branch#9

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