Nicolas is here
Nicolas is here
Merge branch 'master' of https://github.com/24HeuresINSA/24h-android-app

Conflicts:
	app/build.gradle
	app/src/main/res/values/strings.xml
	gradle/wrapper/gradle-wrapper.properties