test
Merge branch 'master' of https://github.com/angelshurikan/CMS

Conflicts:
	app/View/SiteThemeClasses/indexold.ctp
Merge remote-tracking branch 'origin/master'