ha
Merge branch 'master' of https://github.com/LouWii/Studieux

Conflicts:
	AndroidManifest.xml