minor modifications
Merge branch 'develop' of
https://github.com/paulinemontmayeur/RandOnClient.git into develop

Conflicts:
	res/values-fr/strings.xml
	res/values/strings.xml
	src/com/insa/randon/controller/MapActivity.java
	src/com/insa/randon/controller/NewHikeFragment.java