soc-18 registration
soc-18 registration
soc-16 User wall
Merge pull request #20 from HelloWorld-PHPJunior/soc-18

Soc 18
soc-16 User wall
soc-18 registration
Merge pull request #21 from HelloWorld-PHPJunior/soc-18

soc-18 registration
Merge branches 'Branch' and 'master' of github.com:HelloWorld-PHPJunior/soc into Branch

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

Conflicts:
	protected/views/auth/signin.haml