Merge branch 'master' of https://github.com/feskehau/mobile_app

Conflicts:
	app/build.gradle
	app/src/main/AndroidManifest.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/build.gradle
	app/src/main/AndroidManifest.xml
Merge branch 'master' of https://github.com/feskehau/mobile_app

Conflicts:
	app/build.gradle
	app/src/main/AndroidManifest.xml