fixes #71
Merge branch 'dev' of https://github.com/oSoc14/Artoria into dev

Conflicts:
	app/build/outputs/apk/app-release-unaligned.apk
	app/src/main/java/be/artoria/belfortapp/activities/BaseActivity.java
new apk
adding the right release
Merge branch 'dev' of https://github.com/oSoc14/Artoria into dev