test content provider
Merge branch 'master' of github.com:GeoJIR/GeoJIR

Conflicts:
	src/com/geojir/ListMediaActivity.java
Merge branch 'master' of github.com:GeoJIR/GeoJIR

Conflicts:
	src/com/geojir/ListMediaActivity.java