Merge branch 'master' of github.com:HelloWorld-PHPJunior/soc into soc-16
message
message
message
message
soc-16 User wall
Merge branch 'master' of github.com:HelloWorld-PHPJunior/soc into soc-16
Merge remote-tracking branch 'origin/master' into group1-5

Conflicts:
	protected/controllers/SiteController.php
	protected/views/auth/signin.haml
	protected/views/layouts/default.haml
soc-16 User wall
Merge remote-tracking branch 'origin/group1-5' into soc-16

Conflicts:
	protected/controllers/SiteController.php
	protected/views/auth/signin.haml
	protected/views/layouts/default.haml
soc-16 User wall
message
Merge remote-tracking branch 'origin/Branch' into soc-16

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

Conflicts:
	protected/views/auth/signin.haml
	protected/views/layouts/default.haml
message
soc-16 User wall
message
message
message
message