Forget to commit :P
Conflicts:
	src/org/oscim/app/DrawableOverlay.java
	src/org/oscim/app/LocationHandler.java
update to new api, fix formatting and variable naming