test de branche igor
Seconde modif branche igor
Before debugging
Before merging
Merge suite maj
delete R.java from Git
Test Google map in arround activity
Merge branch 'igor' of github.com:GeoJIR/GeoJIR into igor

Conflicts:
	bin/classes/com/geojir/MainActivity.class
	src/com/geojir/MainActivity.java
Merge branch 'romanigor' into igor
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
Before last master merge
AroundActivity self position
add project.properties in .gitignore
Merge branch 'master' into igor