DB Fix 2
Merge branch 'master' of https://github.com/yoavi2/Madgim.git

Conflicts:
	MapTargetFull/AndroidManifest.xml
	MapTargetFull/src/com/example/maptargetfull/MainActivity.java