Merge branch 'master' of https://github.com/AdrienEHB/IntegrationMobileAppWeb

Conflicts:
	Festival Kanal.xcodeproj/project.pbxproj
	Festival Kanal/Base.lproj/Main.storyboard