Merge branch 'master' of github.com:jonatkins/ingress-intel-total-conversion

Conflicts:
	code/panes.js
	mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java

mobile/src/com/cradle/iitc_mobile/compass/Compass.java

@@ -16,10 +16,9 @@ public abstract class Compass
             return new GyroCompass(context);
         else
             return new AccMagCompass(context);
-
     }
-    private final ArrayList<CompassListener> mListeners = new ArrayList<CompassListener>();
 
+    private final ArrayList<CompassListener> mListeners = new ArrayList<CompassListener>();
     private boolean mStarted = false;
 
     protected abstract void onStart();