Merge branch 'master' of https://github.com/PX4/Firmware

Conflicts:
	apps/commander/state_machine_helper.c
	apps/multirotor_att_control/multirotor_att_control_main.c
	apps/multirotor_att_control/multirotor_rate_control.c
solved

ROMFS/scripts/rc.FMU_quad_x

@@ -9,7 +9,7 @@ echo "[init] eeprom"
 eeprom start
 if [ -f /eeprom/parameters ]
 then
-	eeprom load_param /eeprom/parameters
+	param load
 fi
 
 echo "[init] sensors"

ROMFS/scripts/rc.PX4IOAR

@@ -19,7 +19,7 @@ echo "[init] eeprom"
 eeprom start
 if [ -f /eeprom/parameters ]
 then
-	eeprom load_param /eeprom/parameters
+	param load
 fi
  
 #

ROMFS/scripts/rc.standalone

@@ -10,6 +10,16 @@ echo "[init] doing standalone PX4FMU startup..."
 #
 uorb start
 
+#
+# Init the EEPROM
+#
+echo "[init] eeprom"
+eeprom start
+if [ -f /eeprom/parameters ]
+then
+	param load
+fi
+
 #
 # Start the sensors.
 #