Merge
Merge branch 'master' of https://github.com/yoavi2/Madgim

Conflicts:
	MapTargetFull/src/com/example/maptargetfull/AddTargetOnLocationDialog.java
	MapTargetFull/src/com/example/maptargetfull/OfflineMap.java
Merge branch 'master' of https://github.com/yoavi2/Madgim