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

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
	src/com/studieux/main/MainActivity.java