commit
Merge branch 'master' of https://github.com/aarnaud1/Projet-Android-M2IHM

Conflicts:
	SmartDring/AndroidManifest.xml
	SmartDring/bin/AndroidManifest.xml
	SmartDring/bin/classes/com/AJ/smartdring/display/PageLeftFragment.class
	SmartDring/bin/classes/com/AJ/smartdring/display/PageRightFragment.class