Removed compass calibration for final release.

Android/build.gradle

@@ -28,7 +28,7 @@ android {
         applicationId 'org.droidplanner.android'
         minSdkVersion 14
         targetSdkVersion 21
-        versionCode 30017
+        versionCode 30100
         versionName getGitVersion()
     }
 

Android/src/org/droidplanner/android/fragments/SensorSetupFragment.java

@@ -21,13 +21,12 @@
 public class SensorSetupFragment extends Fragment {
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState){
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         return inflater.inflate(R.layout.fragment_sensor_setup, container, false);
     }
 
     @Override
-    public void onViewCreated(View view, Bundle savedInstanceState){
+    public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
         final SensorPagerAdapter pagerAdapter = new SensorPagerAdapter(getActivity()
@@ -36,8 +35,7 @@ public void onViewCreated(View view, Bundle savedInstanceState){
         final ViewPager viewPager = (ViewPager) view.findViewById(R.id.configuration_pager);
         viewPager.setAdapter(pagerAdapter);
 
-        final TabPageIndicator tabIndicator = (TabPageIndicator) view.findViewById(R.id
-                .configuration_tab_strip);
+        final TabPageIndicator tabIndicator = (TabPageIndicator) view.findViewById(R.id.configuration_tab_strip);
         tabIndicator.setViewPager(viewPager);
     }
 
@@ -52,28 +50,30 @@ public SensorPagerAdapter(Context context, FragmentManager fm) {
 
         @Override
         public Fragment getItem(int i) {
-            switch(i){
+            switch (i) {
                 case 0:
                 default:
-                	return new FragmentSetupMAG();
+                    return new FragmentSetupIMU();
                 case 1:
-                	return new FragmentSetupIMU();
+                    return new FragmentSetupMAG();
             }
         }
 
         @Override
         public int getCount() {
-            return 2;
+            //Enable mag calibration when it's fully working.
+//            return 2;
+            return 1;
         }
 
         @Override
-        public CharSequence getPageTitle(int position){
-            switch(position){
+        public CharSequence getPageTitle(int position) {
+            switch (position) {
                 case 0:
                 default:
-                	return FragmentSetupMAG.getTitle(context);
+                    return FragmentSetupIMU.getTitle(context);
                 case 1:
-                	return FragmentSetupIMU.getTitle(context);
+                    return FragmentSetupMAG.getTitle(context);
             }
         }
     }

Android/src/org/droidplanner/android/utils/prefs/DroidPlannerPrefs.java

@@ -15,14 +15,14 @@
 
 /**
  * Provides structured access to Droidplanner preferences
- * 
+ *
  * Over time it might be good to move the various places that are doing
  * prefs.getFoo(blah, default) here - to collect prefs in one place and avoid
  * duplicating string constants (which tend to become stale as code evolves).
  * This is called the DRY (don't repeat yourself) principle of software
  * development.
- * 
- * 
+ *
+ *
  */
 public class DroidPlannerPrefs {
 
@@ -270,7 +270,7 @@ public AutoPanMode getAutoPanMode() {
 
 	/**
 	 * Updates the map auto panning target.
-	 * 
+	 *
 	 * @param target
 	 */
 	public void setAutoPanMode(AutoPanMode target) {

README.md

@@ -2,20 +2,20 @@
 [![Issue Stats](http://issuestats.com/github/DroidPlanner/droidplanner/badge/pr)](http://issuestats.com/github/DroidPlanner/droidplanner)
 [![Issue Stats](http://issuestats.com/github/DroidPlanner/droidplanner/badge/issue)](http://issuestats.com/github/DroidPlanner/droidplanner)
 
-# DroidPlanner
+# Tower
 
-Droidplanner is a Ground Control Station (GCS) Android app built atop [3DR Services](https://github.com/DroidPlanner/3DRServices), for UAVs
+Tower is a Ground Control Station (GCS) Android app built atop [3DR Services](https://github.com/DroidPlanner/3DRServices), for UAVs
 running Ardupilot software.
 
-[![Google Play Store](https://developer.android.com/images/brand/en_app_rgb_wo_45.png)](https://play.google.com/store/apps/details?id=org.droidplanner)
+[![Google Play Store](https://developer.android.com/images/brand/en_app_rgb_wo_45.png)](https://play.google.com/store/apps/details?id=org.droidplanner.android)
 
 ### Usage Guide
 
 The [wiki](https://github.com/DroidPlanner/droidplanner/wiki) has some basic documentation (Help us by making it better!)
 
 For help, visit the [Droidplanner mailing list](https://groups.google.com/forum/#!forum/droidplanner) or the [DroidPlanner Google+ Commnunity](https://plus.google.com/communities/109498440846585781402).
 
-### Droidplanner v3 beta
+### Tower beta
 
 ![Droidplanner 3.0 beta screenshot](https://cloud.githubusercontent.com/assets/914968/5420988/c11105e0-8211-11e4-9f07-92727d7c78ab.png)
 
@@ -28,13 +28,12 @@ The next version of Droidplanner is under development, and we would love your he
  3. Send feedback: Post your feedback in the [Droidplanner Google+ community](https://plus.google.com/communities/109498440846585781402) or the [Droidplanner mailing list](https://groups.google.com/forum/#!forum/droidplanner). We want to hear what you think!
 
 #### Requirement
-In order to run **DroidPlanner v3** on your device, the latest version of **3DR Services** must
-be installed.
+In order to run **Tower** on your device, the latest version of **3DR Services** must be installed.
 To do so, follow the instructions on the [3DR Services github page](https://github.com/DroidPlanner/3DRServices).
 
 ### Contributing
 
-Droidplanner v3 is in active development. If you would like to contribute to the project,
+Tower is in active development. If you would like to contribute to the project,
 see the [Build Setup wiki page](https://github.com/DroidPlanner/droidplanner/wiki).
 
 If you aren't a developer but want to help out, you can do so by improving the documentation in the Wiki or by writing user guides.