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

Conflicts:
	protected/modules/page/controllers/AdminController.php
be26.02