Merge and resolve conflicts from upstream/master

astrid/res/xml/preferences.xml

@@ -11,7 +11,6 @@
     <PreferenceScreen android:title="@string/p_about" android:key="@string/p_about" />
     <PreferenceScreen android:title="@string/welcome_setting" android:key="@string/p_tutorial"/>
     <PreferenceScreen android:title="@string/p_help" android:key="@string/p_help"/>
-    <PreferenceScreen android:title="@string/p_forums" android:key="@string/p_forums"/>
     <PreferenceScreen android:title="@string/p_premium" android:key="@string/p_premium"/>
     
     <PreferenceCategory

astrid/src/com/todoroo/astrid/activity/EditPreferences.java

@@ -83,8 +83,8 @@ public class EditPreferences extends TodorooPreferenceActivity {
 
     private static final String SUPPORT_URL = "http://blog.astrid.com/topics/support/android"; //$NON-NLS-1$
 
-    private static final int APPEARANCE_PREFERENCE = 5;
-    private static final int POWER_PACK_PREFERENCE = 6;
+    private static final int APPEARANCE_PREFERENCE = 4;
+    private static final int POWER_PACK_PREFERENCE = 5;
 
     private static final int REQUEST_CODE_SYNC = 0;
     private static final int REQUEST_CODE_LABS = 1;