butterknife
Merge branch 'master' into romain
pas de modif
Merge branch 'master' into romain
Marker des medias sur la maps
commit normaql
Merge branch 'master' of github.com:GeoJIR/GeoJIR

Conflicts:
	src/com/geojir/AroundActivity.java
	src/com/geojir/ParentMenuActivity.java
Marker par media sur la google map