commit
merged all
Merge branch 'master' of https://github.com/AdamTorkelsson/openmap

Conflicts:
	gen/com/google/android/gms/R.java
	project.properties