123
123Merge branch 'master' of github.com:svbShutik/mgz

Conflicts:
	protected/modules/main/views/view/index.php
small fix and add alertify