Fix Lior's screw up
CONFLICTS
Google sql integration - Might not work
Merge branch 'master' of https://github.com/yoavi2/Madgim

Conflicts:
	MapTargetFull/src/com/example/maptargetfull/GlobalParams.java