Merging
Merge branch 'master' of https://github.com/Ostis/Ostis.git

Conflicts:
	src/OstisAndroidApp/src/fr/ece/ostis/OstisService.java