BIG COMMIT DESIGN AND SOME STUFF
Merge branch 'master' of https://github.com/ingouackaz/L-aps

Conflicts:
	L-Aps/L-Aps/Base.lproj/Main.storyboard
	L-Aps/L-Aps/MiniGame/PointParPoint/EditPointsViewController.m
	L-Aps/L-Aps/MiniGame/PointParPoint/ParametresController.m