no message
Merge branch 'master' of https://github.com/ruslankus/multi_cms

Conflicts:
	js/core.js
no message