icon music ans customImageView
test content provider
Merge branch 'master' of github.com:GeoJIR/GeoJIR

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

Conflicts:
	src/com/geojir/ListMediaActivity.java
add project.properties in .gitignore
Merge branch 'master' into igor