photo par défaut si pas de flickr
Merge branch 'master' of https://github.com/Dexedrine/myteammate.git

Conflicts:
	MyTeamMate/src/MTM/ProfileBundle/Controller/ProfileController.php