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

Conflicts:
	protected/views/auth/signin.haml