hh
Merge branch 'master' of github.com:vanik/imcms

Conflicts:
	protected/runtime/application.log