Merge branch 'iOS' of https://github.com/blueshunter/Projet-Tut-LP-DAM into iOS

Conflicts:
	IUTUnice/IUTUnice/MainMenuViewController.m
Merge remote-tracking branch 'origin/iOS' into iOS
resolving conflict on menu page