MaJ Upload
Merge branch 'master' of https://github.com/Kowah/SocialNetwork

Conflicts:
	MyFace/View/popUpAddImage.php

YOLO