Merge branch 'Branch' of https://github.com/HelloWorld-PHPJunior/group1 into group1-5
Merge branch 'Branch' of https://github.com/HelloWorld-PHPJunior/group1 into group1-5
Merge branch 'Branch' of https://github.com/HelloWorld-PHPJunior/group1 into group1-5
Merge branch 'Branch' of https://github.com/HelloWorld-PHPJunior/group1 into group1-5
soc-15 Create Layout
soc-15 Create Layout
soc-15 Create Layout
soc-15 Create Layout
soc-15 Create Layout
Merge pull request #19 from HelloWorld-PHPJunior/soc-15

Soc 15
message
message
message
message
Merge branch 'master' of github.com:HelloWorld-PHPJunior/soc into Branch

Conflicts:
	protected/controllers/SiteController.php
Merge remote-tracking branch 'origin/group1-5' into Branch

Conflicts:
	protected/components/UserAreaController.php
	protected/components/UserIdentity.php
	protected/components/WebUser.php
	protected/config/main.php
	protected/controllers/SiteController.php
	protected/modules/admin/AdminModule.php
	protected/modules/admin/controllers/DashboardController.php
	protected/views/auth/signin.haml
	protected/views/layouts/default.haml
Merge branch 'master' of github.com:HelloWorld-PHPJunior/soc into Branch

Conflicts:
	protected/controllers/SiteController.php