Lot of work
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Utopya/UtopyaBundle/Entity/User.php