Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	app/config/config_test.yml
	src/Pablo/OrganisationBundle/Tests/Controller/DefaultControllerTest.php
	src/Pablo/PeopleBundle/Resources/views/Teacher/show.html.twig
	src/Pablo/UserBundle/Controller/UserController.php
	src/Pablo/UserBundle/Entity/User.php
	src/Pablo/UserBundle/Form/UserType.php
	src/Pablo/UserBundle/Resources/config/routing.yml
	src/Pablo/UserBundle/Tests/Units/Entity/User.php
Update 20130718