Merge branch 'master' of
https://github.com/AVATAR-PANIC/AVATAR-PANIC.git

Conflicts:
	AVATAR working copy/res/layout/point_settings_dialog.xml
	AVATAR working
copy/src/com/guardian_angel/uav_tracker/CameraRecord.java
Merge branch 'master' of
https://github.com/AVATAR-PANIC/AVATAR-PANIC.git