c
Merge branch 'master' of github.com:vmonsalve/sysAdmin

Conflicts:
	src/projectAdmin/loginBundle/Controller/DefaultController.php