Editing some xml errors
Merge branch 'master' of
https://github.com/AVATAR-PANIC/GuardianAngel.git

Conflicts:
	UAV-T/bin/classes/biz/source_code/base64Coder/Base64Coder.class
	UAV-T/bin/classes/com/guardian_angel/uav_tracker/CameraRecord$5.class
	UAV-T/bin/classes/com/guardian_angel/uav_tracker/CameraRecord.class
	UAV-T/bin/classes/com/guardian_angel/uav_tracker/GAdirections.class
	UAV-T/bin/classes/com/guardian_angel/uav_tracker/MainActivity$1.class
	UAV-T/bin/classes/com/guardian_angel/uav_tracker/MainActivity$2.class
	UAV-T/bin/classes/com/guardian_angel/uav_tracker/MainActivity$6.class
	UAV-T/bin/classes/com/guardian_angel/uav_tracker/MainActivity$7.class
	UAV-T/bin/classes/com/guardian_angel/uav_tracker/MainActivity$8.class
	UAV-T/bin/classes/com/guardian_angel/uav_tracker/MainActivity.class
	UAV-T/bin/classes/com/guardian_angel/uav_tracker/Map$21.class
	UAV-T/bin/classes/com/guardian_angel/uav_tracker/Map$22.class
	UAV-T/bin/classes/com/guardian_angel/uav_tracker/Map$MyOverlay.class
	UAV-T/bin/classes/com/guardian_angel/uav_tracker/Map.class
	UAV-T/bin/classes/com/guardian_angel/uav_tracker/NotificationService$1.class
	UAV-T/bin/classes/com/guardian_angel/uav_tracker/NotificationService$MyLocationListener.class
	UAV-T/bin/classes/com/guardian_angel/uav_tracker/NotificationService.class
	UAV-T/bin/classes/com/guardian_angel/uav_tracker/Splash$1.class
	UAV-T/bin/classes/com/guardian_angel/uav_tracker/UserData$1.class
	UAV-T/bin/classes/com/guardian_angel/uav_tracker/UserData$10.class
	UAV-T/bin/classes/com/guardian_angel/uav_tracker/UserData$2.class
	UAV-T/bin/classes/com/guardian_angel/uav_tracker/UserData$3.class
	UAV-T/bin/classes/com/guardian_angel/uav_tracker/UserData$4.class
	UAV-T/bin/classes/com/guardian_angel/uav_tracker/UserData$5.class
	UAV-T/bin/classes/com/guardian_angel/uav_tracker/UserData$6.class
	UAV-T/bin/classes/com/guardian_angel/uav_tracker/UserData$7.class
	UAV-T/bin/classes/com/guardian_angel/uav_tracker/UserData$8.class
	UAV-T/bin/classes/com/guardian_angel/uav_tracker/UserData$9.class
	UAV-T/bin/classes/com/guardian_angel/uav_tracker/XMPPMessage.class
	UAV-T/bin/classes/com/guardian_angel/uav_tracker/XMPPSender.class