Change frontend webpage module
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/controllers/PortalController.php
	themes/blue/views/layouts/admin.php
Merge branch 'master' of https://github.com/vim-bogota2/vi