Merge branch 'master' of github.com:HelloWorld-PHPJunior/soc into soc-16
soc-16 User wall
Merge branch 'master' of github.com:HelloWorld-PHPJunior/soc into soc-16
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
Merge remote-tracking branch 'origin/Branch' into soc-16

Conflicts:
	protected/controllers/SiteController.php
	protected/views/auth/signin.haml
Merge branches 'Branch' and 'master' of github.com:HelloWorld-PHPJunior/soc into Branch

Conflicts:
	protected/views/auth/signin.haml
Merge pull request #23 from HelloWorld-PHPJunior/Branch

Edit User Profile
soc-16 User wall
message
message