Layout
merge
merge
Merge branch 'master' of https://github.com/IndexOutOfRange/ProjectDIAW

Conflicts:
	AppliAndroid/AndroidManifest.xml
	AppliAndroid/res/values/strings.xml