Merge branch 'master' of github.com:HelloWorld-PHPJunior/soc into group1-4

Conflicts:
	protected/views/layouts/default.haml