Merge remote-tracking branch 'origin/master' into next

Conflicts:
	HISTORY.txt

CREDITS.txt

@@ -122,6 +122,9 @@ D: 3D Modelling, Easystar adaption from FMS
 N: Guy McCaldin
 D: Artwork and design including work on the Deluxe Dial Set
 
+N: Alessio Morale
+D: Firmware/Architecture Lead
+
 N: Cathy Moss
 D: Hardware design Lead: Gen 2 Mainboard, PipXtreme, Current Sensor
 D: PipXtreme designer, creator OP Map Plugin
@@ -156,7 +159,6 @@ D: Lead INS Developer
 D: Creator of the OpenPilot INS / EKF
 
 N: Professor Kenn Sebesta
-E: kenn (at) openpilot (dot) org
 D: Lead Fixed Wing Developer CC3D / Controls
 D: GCS improvments including HiTL Merge
 M: Fixed Wing support CC3D

HISTORY.txt

@@ -7,6 +7,15 @@ stabilization to manual control input and now available also for main controls),
 optional airframe attitude filtering used by camera stabilization, and optional
 camera actuator feed forward to improve gimbal response.
 
+--- RELEASE-12.10.2 --- Mayan Apocalypse Release ---
+
+List of issues resolved in this maintenance release:
+http://progress.openpilot.org/issues/?filter=10361
+
+OP-459, OP-545, OP-674, OP-679, OP-685, OP-686, OP-687, OP-690, OP-691,
+OP-702, OP-703, OP-714, OP-715, OP-716, OP-721, OP-728, OP-746, OP-748,
+OP-749, OP-750, OP-758, OP-759, OP-760
+
 2012-11-12
 Implemented smoothing filter for accelerometer data.
 Added support for Mode 3 and Mode 4 to the TX Configuration Wizard.
@@ -34,7 +43,7 @@ Several UI changes.
 MixerCurveWidget refactoring, now as a simple and advanced view.
 
 2012-07-27
-Added “advanced mode” option to general settings. Right now it only shows the hidden apply buttons.
+Added "advanced mode" option to general settings. Right now it only shows the hidden apply buttons.
 To enable go to tools->options->General and click one of the checkboxes to give focus to the form,
 then press F7
 

KNOWN_ISSUES.txt

@@ -15,3 +15,7 @@ following URL: http://bugs.openpilot.org/browse/OP-XXX
 + [OP-747] Board infinitely reboots itself after firmware upgrade (settings erase firmware is a workaround).
 + [OP-723] GCS uses the system language ot the 1st run. After restart it uses English (can be changed later).
 + [OP-725] GCS camera stab config error message disappears too fast (but config error is cleared as it should)
++ [OP-767] GCS does not send AttitudeActual packets over serial port when GPS is connected and system is armed
++ [OP-768] GCS does not show UAV position on the map (master or next CC branches, but works in Revo branches)
++ [OP-682] GCS crashes on firmware page. Noted on Windows and OSX platforms, difficult to reproduce.
+           Workaround: use Vehicle setup wizard to update the firmware.

ground/openpilotgcs/src/plugins/coreplugin/CREDITS.html

@@ -45,6 +45,7 @@ Ken Northup
 Greg Matthews
 Guy McCaldin
 Gary Mortimer
+Alessio Morale
 Cathy Moss
 Angus Peart
 Dmytro Poplavskiy

package/Makefile.linux

@@ -10,7 +10,7 @@ VERSION_FULL		:= $(VERNUM)-$(PACKAGE_LBL)
 DEB_BUILD_DIR		:= $(ROOT_DIR)/debian
 
 SED_DATE_STRG		= $(shell date -R)
-SED_SCRIPT		= s/<VERSION>/$(PACKAGE_LBL)/;s/<DATE>/$(SED_DATE_STRG)/
+SED_SCRIPT		= s/<VERSION>/$(VERNUM)/;s/<DATE>/$(SED_DATE_STRG)/
 
 DEB_CFG_CMN		:= $(ROOT_DIR)/package/linux/deb_common
 DEB_CFG_I386_DIR	:= $(ROOT_DIR)/package/linux/deb_i386
@@ -28,7 +28,7 @@ DEB_PLATFORM		:= i386
 DEB_MACHINE_DIR		:= $(DEB_CFG_I386_DIR)
 DEB_MACHINE_FILES	:= $(DEB_CFG_I386_FILES)
 endif
-DEB_PACKAGE_NAME	:= openpilot_$(PACKAGE_LBL)_$(DEB_PLATFORM)
+DEB_PACKAGE_NAME	:= openpilot_$(VERNUM)_$(DEB_PLATFORM)
 FULL_PACKAGE_NAME	:= $(PACKAGE_NAME)$(PACKAGE_SEP)$(PACKAGE_LBL)$(PACKAGE_SEP)$(DEB_PLATFORM)
 
 ALL_DEB_FILES  = $(foreach f, $(DEB_CFG_CMN_FILES), $(DEB_BUILD_DIR)/$(f))