removed auto-generated file
Merge branch 'master' of https://github.com/michaael-l/android.git

Conflicts:
	SimpleGpsTracker/SimpleGPSTracker/project.properties