Fixed mergeproblems
BUgfixes with sending updates. Added update method in ILayer
Merge remote-tracking branch 'origin/dev-gui' into dev-serverlayer

Conflicts:
	.classpath
	AndroidManifest.xml
	libs/android-maps-utils-0.1/library/.classpath
Added update
Merge remote-tracking branch 'origin/dev-gui' into dev-serverlayer
Added UpdateTimerTask