Mise au propre des fichiers de BDD avec Contract et BaseColumn
commit de butterknife
Merge branch 'master' of github.com:GeoJIR/GeoJIR

Conflicts:
	.gitignore
Merge branch 'master' into romanigor

Conflicts:
	src/com/geojir/ListMediaActivity.java
	src/com/geojir/ListMediaDb.java
	src/com/geojir/ParentMenuActivity.java
after merging
After merging
after merging 2
Probleme du focus rélgé + rafaichissement aprés un enregistrement
optimize delete database
optimize shared preferences field empty
commit modif de romanigor
Merge branch 'master' of github.com:GeoJIR/GeoJIR
Merge igor
Optimize delete database request
Optimize shared preferences on empty TextEdit
Modify database constructor with DATABASE_NAME
Merge Igor
Optimize delete database request
Optimize shared preferences on empty TextEdit
Modify database constructor with DATABASE_NAME GeoJIR
GeoJIR.db
DATABASE_NAME GeoJIR.db
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