fix arguments bug with DIMU
fix wrong var type declaration.
Merge branch 'master' of bitbucket.org:sandmen/qgroundcontrol
make LiPo voltages potentially configurable (and fix bogus type declaration).
Add map type selection options to 2D map (Google, Bing, or OSM);
Saves last map type used;
Fix restoring last map position and zoom level on startup.
Fix check for existing serial connection before flashing fw.
Add M-Link radio type option.
Enforce ground time by default in mavlink data plot & fix saving that setting.
update sim3.exe cal.exe sim3.params sim3_dimu.params
Revert updated sim3.exe & cal.exe, new cal --mag abort command, for now.

This reverts commit fba52ac88202f4e0cd02035ea23aa77e731f60f1 and part of afb9a4f1517bfa11beaff1104c7184c9e4c886d4.
update version number.