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

Conflicts:
	MapTargetFull/src/com/example/maptargetfull/DrawSample.java
	MapTargetFull/src/com/example/maptargetfull/EditTargetDialog.java
	MapTargetFull/src/com/example/maptargetfull/FirstFragment.java
	MapTargetFull/src/com/example/maptargetfull/FriendListAdapter.java
	MapTargetFull/src/com/example/maptargetfull/GlobalParams.java
	MapTargetFull/src/com/example/maptargetfull/MainActivity.java
	MapTargetFull/src/com/example/maptargetfull/SecondFragment.java
Merge branch 'master' of https://github.com/yoavi2/Madgim.git