import library google
Ajout d'un fragment edit message sur un long click
Merge branch 'master' of github.com:SIMS-Topaz/sims-topaz-android

Conflicts:
	android/AndroidManifest.xml
	android/project.properties
	android/src/com/sims/topaz/MapFragment.java