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

Conflicts:
	SmartDring/src/com/AJ/smartdring/display/ItemDetailFragment.java
Merge branch 'master' of https://github.com/aarnaud1/Projet-Android-M2IHM