add maps
update db gestion
Merge map and updating db
list image
merge new db gestion and map
display images on medias list
merge new db gestion and map
display images on medias list
add string variable
add string variables
on enleve R.java du versionnage
Quelques modifs pour implementer google maps
Merge branch 'master' of github.com:GeoJIR/GeoJIR

Conflicts:
	AndroidManifest.xml
	res/layout/activity_around.xml
	src/com/geojir/AroundActivity.java
mise en commentaire de bout de code qui pose probleme
liste image correction
Merge branch 'master' into igor

Conflicts:
	AndroidManifest.xml
	project.properties
	res/layout/activity_around.xml
	src/com/geojir/AroundActivity.java
	src/com/geojir/ListMediaActivity.java
	src/com/geojir/ListMediaDb.java
Nouveau package BDD
Empty liste, music icon and icon dimension
packaging DB
Before last master merge
AroundActivity self position