merge
Merge branch 'master' of https://github.com/DamienBen-Faro/iZicabClient

Conflicts:
	iZicab/Main_iPhone.storyboard