scripts upd
Merge branch 'master' of https://github.com/a13dev/softlycms

Conflicts:
	_projects/propazham/include/cms_header.php