Squashed commit of the following:

commit 5123761b47a0069b81fc8fa4dfd2745a21e35521
Author: ahmad mohammad al saleem <ahmad.alsaleem.cpe@gmail.com>
Date:   Thu Jun 6 00:42:05 2013 +0200

    fixing Branch

commit e8b48544c6a867ce37048ca0a0a5e1a2db251fcd
Author: ahmad mohammad al saleem <ahmad.alsaleem.cpe@gmail.com>
Date:   Wed Jun 5 16:50:04 2013 +0200

    merging
- still missing files..
- update to new vtm-android api, formatting and fixing variables names
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
fix null pointer acces
remove unused imports
remove unused fields
remove unused imports
use logger TAG
--dbg logs
merging
merging
merging