aaa
fix
fiiiiiiiiiiiiiiiix
Merge branch 'master' of https://github.com/yoavi2/Madgim.git

Conflicts:
	MapTargetFull/.settings/org.eclipse.core.resources.prefs