Merge remote branch 'origin/master'

Conflicts:
	fr.istic.cor3f/android/fr.istic.cor3f.android.map/src/main/java/fr/istic/cor3f/android/map/MapInterventionComponent.java
Merge remote branch 'origin/master'