diff --git a/android-app/AndroidManifest.xml b/android-app/AndroidManifest.xml
index 59313e5..e0abbd9 100644
--- a/android-app/AndroidManifest.xml
+++ b/android-app/AndroidManifest.xml
@@ -17,9 +17,9 @@
 <!--  Note; Version code/name is IOSched version (16), Droidcon Version (01) -->
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:versionCode="2011100601"
-    android:versionName="DCUK-2011.01"
-    android:installLocation="auto" package="com.funkyandroid.droidcon2011">
+    android:versionCode="2011100704"
+    android:versionName="DCUK-2011.04"
+    android:installLocation="auto" package="com.novoda.droidcon2011">
 
     <uses-sdk
         android:minSdkVersion="7"
@@ -194,7 +194,7 @@
 
         <provider
             android:name="com.google.android.apps.iosched.provider.ScheduleProvider"
-            android:authorities="com.funkyandroid.droidcon2011.iosched"
+            android:authorities="com.novoda.droidcon2011.iosched"
             android:writePermission="com.google.android.apps.iosched.permission.WRITE_SCHEDULE" />
 
     </application>
diff --git a/android-app/res/drawable-mdpi/ic_launcher.png b/android-app/res/drawable-mdpi/ic_launcher.png
index 863b622..2f17809 100644
Binary files a/android-app/res/drawable-mdpi/ic_launcher.png and b/android-app/res/drawable-mdpi/ic_launcher.png differ
diff --git a/android-app/res/layout/blocks_content.xml b/android-app/res/layout/blocks_content.xml
index d78bdc7..bb4c191 100644
--- a/android-app/res/layout/blocks_content.xml
+++ b/android-app/res/layout/blocks_content.xml
@@ -16,7 +16,7 @@
 <view
     class="com.google.android.apps.iosched.ui.widget.ObservableScrollView"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:iosched="http://schemas.android.com/apk/res/com.funkyandroid.droidcon2011"
+    xmlns:iosched="http://schemas.android.com/apk/res/com.novoda.droidcon2011"
     android:id="@+id/blocks_scroll"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
diff --git a/android-app/res/layout/fragment_dashboard.xml b/android-app/res/layout/fragment_dashboard.xml
index d664726..97f6c71 100644
--- a/android-app/res/layout/fragment_dashboard.xml
+++ b/android-app/res/layout/fragment_dashboard.xml
@@ -34,10 +34,6 @@
         style="@style/DashboardButton"
         android:text="@string/btn_starred"
         android:drawableTop="@drawable/home_btn_starred" />
-    <Button android:id="@+id/home_btn_vendors"
-        style="@style/DashboardButton"
-        android:text="@string/btn_vendors"
-        android:drawableTop="@drawable/home_btn_vendors" />
     <Button android:id="@+id/home_btn_announcements"
         style="@style/DashboardButton"
         android:text="@string/btn_announcements"
diff --git a/android-app/res/values/strings.xml b/android-app/res/values/strings.xml
index fbd7791..4063f5d 100644
--- a/android-app/res/values/strings.xml
+++ b/android-app/res/values/strings.xml
@@ -160,7 +160,7 @@
     <string name="about_address_title">Address:</string>
     <string name="about_address_txt">52 Upper Street\nIslington, London\nN1 0QH</string>
 	<string name="about_twitter">\&#x40;droidconuk</string>
-	<string name="about_twitter_hashtag">#droidcon</string>
+	<string name="about_twitter_hashtag">#droidconUK</string>
 	<string name="about_conference_link">uk.droidcon.com</string>
 	<string name="about_sponsors_title_orange">Platinum Sponsor</string>
 	<string name="about_sponsors_title_sonyericsson">Silver Sponsor</string>
diff --git a/android-app/src/com/google/android/apps/iosched/io/LocalRoomsHandler.java b/android-app/src/com/google/android/apps/iosched/io/LocalRoomsHandler.java
index 50b449b..ffa246d 100644
--- a/android-app/src/com/google/android/apps/iosched/io/LocalRoomsHandler.java
+++ b/android-app/src/com/google/android/apps/iosched/io/LocalRoomsHandler.java
@@ -16,10 +16,13 @@
 
 package com.google.android.apps.iosched.io;
 
-import com.funkyandroid.droidcon2011.R;
-import com.google.android.apps.iosched.provider.ScheduleContract;
-import com.google.android.apps.iosched.provider.ScheduleContract.Rooms;
-import com.google.android.apps.iosched.util.Lists;
+import static org.xmlpull.v1.XmlPullParser.END_DOCUMENT;
+import static org.xmlpull.v1.XmlPullParser.END_TAG;
+import static org.xmlpull.v1.XmlPullParser.START_TAG;
+import static org.xmlpull.v1.XmlPullParser.TEXT;
+
+import java.io.IOException;
+import java.util.ArrayList;
 
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
@@ -27,13 +30,10 @@
 import android.content.ContentProviderOperation;
 import android.content.ContentResolver;
 
-import java.io.IOException;
-import java.util.ArrayList;
-
-import static org.xmlpull.v1.XmlPullParser.END_DOCUMENT;
-import static org.xmlpull.v1.XmlPullParser.END_TAG;
-import static org.xmlpull.v1.XmlPullParser.START_TAG;
-import static org.xmlpull.v1.XmlPullParser.TEXT;
+import com.google.android.apps.iosched.provider.ScheduleContract;
+import com.google.android.apps.iosched.provider.ScheduleContract.Rooms;
+import com.google.android.apps.iosched.util.Lists;
+import com.novoda.droidcon2011.R;
 
 /**
  * Handle a local {@link XmlPullParser} that defines a set of {@link Rooms}
diff --git a/android-app/src/com/google/android/apps/iosched/provider/ScheduleContract.java b/android-app/src/com/google/android/apps/iosched/provider/ScheduleContract.java
index defc3ad..0d6c5f6 100644
--- a/android-app/src/com/google/android/apps/iosched/provider/ScheduleContract.java
+++ b/android-app/src/com/google/android/apps/iosched/provider/ScheduleContract.java
@@ -154,7 +154,7 @@ interface VendorsColumns {
         String VENDOR_STARRED = "vendor_starred";
     }
 
-    public static final String CONTENT_AUTHORITY = "com.funkyandroid.droidcon2011.iosched";
+    public static final String CONTENT_AUTHORITY = "com.novoda.droidcon2011.iosched";
 
     private static final Uri BASE_CONTENT_URI = Uri.parse("content://" + CONTENT_AUTHORITY);
 
diff --git a/android-app/src/com/google/android/apps/iosched/service/SyncService.java b/android-app/src/com/google/android/apps/iosched/service/SyncService.java
index 389c952..5014eaf 100644
--- a/android-app/src/com/google/android/apps/iosched/service/SyncService.java
+++ b/android-app/src/com/google/android/apps/iosched/service/SyncService.java
@@ -16,19 +16,9 @@
 
 package com.google.android.apps.iosched.service;
 
-import com.funkyandroid.droidcon2011.R;
-import com.google.android.apps.iosched.io.LocalBlocksHandler;
-import com.google.android.apps.iosched.io.LocalExecutor;
-import com.google.android.apps.iosched.io.LocalRoomsHandler;
-import com.google.android.apps.iosched.io.LocalSearchSuggestHandler;
-import com.google.android.apps.iosched.io.LocalSessionsHandler;
-import com.google.android.apps.iosched.io.LocalTracksHandler;
-import com.google.android.apps.iosched.io.RemoteExecutor;
-import com.google.android.apps.iosched.io.RemoteSessionsHandler;
-import com.google.android.apps.iosched.io.RemoteSpeakersHandler;
-import com.google.android.apps.iosched.io.RemoteVendorsHandler;
-import com.google.android.apps.iosched.io.RemoteWorksheetsHandler;
-import com.google.android.apps.iosched.provider.ScheduleProvider;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.zip.GZIPInputStream;
 
 import org.apache.http.Header;
 import org.apache.http.HeaderElement;
@@ -61,9 +51,19 @@
 import android.text.format.DateUtils;
 import android.util.Log;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.zip.GZIPInputStream;
+import com.google.android.apps.iosched.io.LocalBlocksHandler;
+import com.google.android.apps.iosched.io.LocalExecutor;
+import com.google.android.apps.iosched.io.LocalRoomsHandler;
+import com.google.android.apps.iosched.io.LocalSearchSuggestHandler;
+import com.google.android.apps.iosched.io.LocalSessionsHandler;
+import com.google.android.apps.iosched.io.LocalTracksHandler;
+import com.google.android.apps.iosched.io.RemoteExecutor;
+import com.google.android.apps.iosched.io.RemoteSessionsHandler;
+import com.google.android.apps.iosched.io.RemoteSpeakersHandler;
+import com.google.android.apps.iosched.io.RemoteVendorsHandler;
+import com.google.android.apps.iosched.io.RemoteWorksheetsHandler;
+import com.google.android.apps.iosched.provider.ScheduleProvider;
+import com.novoda.droidcon2011.R;
 
 /**
  * Background {@link Service} that synchronizes data living in
diff --git a/android-app/src/com/google/android/apps/iosched/ui/BaseSinglePaneActivity.java b/android-app/src/com/google/android/apps/iosched/ui/BaseSinglePaneActivity.java
index 76e3320..ccab7e0 100644
--- a/android-app/src/com/google/android/apps/iosched/ui/BaseSinglePaneActivity.java
+++ b/android-app/src/com/google/android/apps/iosched/ui/BaseSinglePaneActivity.java
@@ -16,12 +16,12 @@
 
 package com.google.android.apps.iosched.ui;
 
-import com.funkyandroid.droidcon2011.R;
-
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 
+import com.novoda.droidcon2011.R;
+
 /**
  * A {@link BaseActivity} that simply contains a single fragment. The intent used to invoke this
  * activity is forwarded to the fragment as arguments during fragment instantiation. Derived
diff --git a/android-app/src/com/google/android/apps/iosched/ui/BulletinFragment.java b/android-app/src/com/google/android/apps/iosched/ui/BulletinFragment.java
index b2365cd..c051365 100644
--- a/android-app/src/com/google/android/apps/iosched/ui/BulletinFragment.java
+++ b/android-app/src/com/google/android/apps/iosched/ui/BulletinFragment.java
@@ -16,8 +16,7 @@
 
 package com.google.android.apps.iosched.ui;
 
-import com.funkyandroid.droidcon2011.R;
-import com.google.android.apps.iosched.util.AnalyticsUtils;
+import java.util.regex.Pattern;
 
 import android.content.Intent;
 import android.graphics.Bitmap;
@@ -33,7 +32,8 @@
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
-import java.util.regex.Pattern;
+import com.google.android.apps.iosched.util.AnalyticsUtils;
+import com.novoda.droidcon2011.R;
 
 /**
  * A fragment containing a {@link WebView} pointing to the I/O announcements URL.
diff --git a/android-app/src/com/google/android/apps/iosched/ui/DashboardFragment.java b/android-app/src/com/google/android/apps/iosched/ui/DashboardFragment.java
index 5a89274..0e36a5b 100644
--- a/android-app/src/com/google/android/apps/iosched/ui/DashboardFragment.java
+++ b/android-app/src/com/google/android/apps/iosched/ui/DashboardFragment.java
@@ -16,7 +16,13 @@
 
 package com.google.android.apps.iosched.ui;
 
-import com.funkyandroid.droidcon2011.R;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
 import com.google.android.apps.iosched.provider.ScheduleContract;
 import com.google.android.apps.iosched.ui.phone.ScheduleActivity;
 import com.google.android.apps.iosched.ui.tablet.ScheduleMultiPaneActivity;
@@ -24,13 +30,7 @@
 import com.google.android.apps.iosched.ui.tablet.VendorsMultiPaneActivity;
 import com.google.android.apps.iosched.util.AnalyticsUtils;
 import com.google.android.apps.iosched.util.UIUtils;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
+import com.novoda.droidcon2011.R;
 
 public class DashboardFragment extends Fragment {
 
@@ -84,22 +84,22 @@ public void onClick(View view) {
             }
         });
 
-        root.findViewById(R.id.home_btn_vendors).setOnClickListener(new View.OnClickListener() {
-            public void onClick(View view) {
-                fireTrackerEvent("Sandbox");
-                // Launch vendors list
-                if (UIUtils.isHoneycombTablet(getActivity())) {
-                    startActivity(new Intent(getActivity(), VendorsMultiPaneActivity.class));
-                } else {
-                    final Intent intent = new Intent(Intent.ACTION_VIEW,
-                            ScheduleContract.Tracks.CONTENT_URI);
-                    intent.putExtra(Intent.EXTRA_TITLE, getString(R.string.title_vendor_tracks));
-                    intent.putExtra(TracksFragment.EXTRA_NEXT_TYPE,
-                            TracksFragment.NEXT_TYPE_VENDORS);
-                    startActivity(intent);
-                }
-            }
-        });
+//        root.findViewById(R.id.home_btn_vendors).setOnClickListener(new View.OnClickListener() {
+//            public void onClick(View view) {
+//                fireTrackerEvent("Sandbox");
+//                // Launch vendors list
+//                if (UIUtils.isHoneycombTablet(getActivity())) {
+//                    startActivity(new Intent(getActivity(), VendorsMultiPaneActivity.class));
+//                } else {
+//                    final Intent intent = new Intent(Intent.ACTION_VIEW,
+//                            ScheduleContract.Tracks.CONTENT_URI);
+//                    intent.putExtra(Intent.EXTRA_TITLE, getString(R.string.title_vendor_tracks));
+//                    intent.putExtra(TracksFragment.EXTRA_NEXT_TYPE,
+//                            TracksFragment.NEXT_TYPE_VENDORS);
+//                    startActivity(intent);
+//                }
+//            }
+//        });
 
         root.findViewById(R.id.home_btn_about).setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
diff --git a/android-app/src/com/google/android/apps/iosched/ui/HomeActivity.java b/android-app/src/com/google/android/apps/iosched/ui/HomeActivity.java
index 9e04209..9922a6c 100644
--- a/android-app/src/com/google/android/apps/iosched/ui/HomeActivity.java
+++ b/android-app/src/com/google/android/apps/iosched/ui/HomeActivity.java
@@ -16,12 +16,6 @@
 
 package com.google.android.apps.iosched.ui;
 
-import com.funkyandroid.droidcon2011.R;
-import com.google.android.apps.iosched.service.SyncService;
-import com.google.android.apps.iosched.util.AnalyticsUtils;
-import com.google.android.apps.iosched.util.DetachableResultReceiver;
-import com.google.android.apps.iosched.util.EulaHelper;
-
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
@@ -32,6 +26,12 @@
 import android.view.MenuItem;
 import android.widget.Toast;
 
+import com.google.android.apps.iosched.service.SyncService;
+import com.google.android.apps.iosched.util.AnalyticsUtils;
+import com.google.android.apps.iosched.util.DetachableResultReceiver;
+import com.google.android.apps.iosched.util.EulaHelper;
+import com.novoda.droidcon2011.R;
+
 /**
  * Front-door {@link Activity} that displays high-level features the schedule application offers to
  * users. Depending on whether the device is a phone or an Android 3.0+ tablet, different layouts
diff --git a/android-app/src/com/google/android/apps/iosched/ui/MapFragment.java b/android-app/src/com/google/android/apps/iosched/ui/MapFragment.java
index 6b72064..b560ed2 100644
--- a/android-app/src/com/google/android/apps/iosched/ui/MapFragment.java
+++ b/android-app/src/com/google/android/apps/iosched/ui/MapFragment.java
@@ -16,12 +16,6 @@
 
 package com.google.android.apps.iosched.ui;
 
-import com.funkyandroid.droidcon2011.R;
-import com.google.android.apps.iosched.provider.ScheduleContract;
-import com.google.android.apps.iosched.provider.ScheduleContract.Rooms;
-import com.google.android.apps.iosched.util.AnalyticsUtils;
-import com.google.android.apps.iosched.util.ParserUtils;
-
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.net.Uri;
@@ -39,6 +33,12 @@
 import android.webkit.WebViewClient;
 import android.widget.Toast;
 
+import com.google.android.apps.iosched.provider.ScheduleContract;
+import com.google.android.apps.iosched.provider.ScheduleContract.Rooms;
+import com.google.android.apps.iosched.util.AnalyticsUtils;
+import com.google.android.apps.iosched.util.ParserUtils;
+import com.novoda.droidcon2011.R;
+
 /**
  * Shows a {@link WebView} with a map of the conference venue.
  */
diff --git a/android-app/src/com/google/android/apps/iosched/ui/ScheduleFragment.java b/android-app/src/com/google/android/apps/iosched/ui/ScheduleFragment.java
index 868387e..84d0933 100644
--- a/android-app/src/com/google/android/apps/iosched/ui/ScheduleFragment.java
+++ b/android-app/src/com/google/android/apps/iosched/ui/ScheduleFragment.java
@@ -16,18 +16,10 @@
 
 package com.google.android.apps.iosched.ui;
 
-import com.funkyandroid.droidcon2011.R;
-import com.google.android.apps.iosched.provider.ScheduleContract;
-import com.google.android.apps.iosched.ui.widget.BlockView;
-import com.google.android.apps.iosched.ui.widget.BlocksLayout;
-import com.google.android.apps.iosched.ui.widget.ObservableScrollView;
-import com.google.android.apps.iosched.ui.widget.Workspace;
-import com.google.android.apps.iosched.util.AnalyticsUtils;
-import com.google.android.apps.iosched.util.Maps;
-import com.google.android.apps.iosched.util.MotionEventUtils;
-import com.google.android.apps.iosched.util.NotifyingAsyncQueryHandler;
-import com.google.android.apps.iosched.util.ParserUtils;
-import com.google.android.apps.iosched.util.UIUtils;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.TimeZone;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -54,10 +46,18 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.TimeZone;
+import com.google.android.apps.iosched.provider.ScheduleContract;
+import com.google.android.apps.iosched.ui.widget.BlockView;
+import com.google.android.apps.iosched.ui.widget.BlocksLayout;
+import com.google.android.apps.iosched.ui.widget.ObservableScrollView;
+import com.google.android.apps.iosched.ui.widget.Workspace;
+import com.google.android.apps.iosched.util.AnalyticsUtils;
+import com.google.android.apps.iosched.util.Maps;
+import com.google.android.apps.iosched.util.MotionEventUtils;
+import com.google.android.apps.iosched.util.NotifyingAsyncQueryHandler;
+import com.google.android.apps.iosched.util.ParserUtils;
+import com.google.android.apps.iosched.util.UIUtils;
+import com.novoda.droidcon2011.R;
 
 /**
  * Shows a horizontally-pageable calendar of conference days. Horizontaly paging is achieved using
diff --git a/android-app/src/com/google/android/apps/iosched/ui/SearchActivity.java b/android-app/src/com/google/android/apps/iosched/ui/SearchActivity.java
index c022a7a..77b8411 100644
--- a/android-app/src/com/google/android/apps/iosched/ui/SearchActivity.java
+++ b/android-app/src/com/google/android/apps/iosched/ui/SearchActivity.java
@@ -16,12 +16,6 @@
 
 package com.google.android.apps.iosched.ui;
 
-import com.funkyandroid.droidcon2011.R;
-import com.google.android.apps.iosched.provider.ScheduleContract.Sessions;
-import com.google.android.apps.iosched.provider.ScheduleContract.Vendors;
-import com.google.android.apps.iosched.ui.phone.SessionDetailActivity;
-import com.google.android.apps.iosched.ui.phone.VendorDetailActivity;
-
 import android.app.SearchManager;
 import android.content.Intent;
 import android.os.Bundle;
@@ -33,6 +27,12 @@
 import android.widget.TabWidget;
 import android.widget.TextView;
 
+import com.google.android.apps.iosched.provider.ScheduleContract.Sessions;
+import com.google.android.apps.iosched.provider.ScheduleContract.Vendors;
+import com.google.android.apps.iosched.ui.phone.SessionDetailActivity;
+import com.google.android.apps.iosched.ui.phone.VendorDetailActivity;
+import com.novoda.droidcon2011.R;
+
 /**
  * An activity that shows session and sandbox search results. This activity can be either single
  * or multi-pane, depending on the device configuration. We want the multi-pane support that
diff --git a/android-app/src/com/google/android/apps/iosched/ui/SessionDetailFragment.java b/android-app/src/com/google/android/apps/iosched/ui/SessionDetailFragment.java
index 587ca1a..ea861c8 100644
--- a/android-app/src/com/google/android/apps/iosched/ui/SessionDetailFragment.java
+++ b/android-app/src/com/google/android/apps/iosched/ui/SessionDetailFragment.java
@@ -16,16 +16,6 @@
 
 package com.google.android.apps.iosched.ui;
 
-import com.funkyandroid.droidcon2011.R;
-import com.google.android.apps.iosched.provider.ScheduleContract;
-import com.google.android.apps.iosched.util.ActivityHelper;
-import com.google.android.apps.iosched.util.AnalyticsUtils;
-import com.google.android.apps.iosched.util.BitmapUtils;
-import com.google.android.apps.iosched.util.CatchNotesHelper;
-import com.google.android.apps.iosched.util.FractionalTouchDelegate;
-import com.google.android.apps.iosched.util.NotifyingAsyncQueryHandler;
-import com.google.android.apps.iosched.util.UIUtils;
-
 import android.content.BroadcastReceiver;
 import android.content.ContentValues;
 import android.content.Context;
@@ -43,7 +33,6 @@
 import android.text.TextUtils;
 import android.text.method.LinkMovementMethod;
 import android.text.style.StyleSpan;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -55,6 +44,16 @@
 import android.widget.TabHost;
 import android.widget.TextView;
 
+import com.google.android.apps.iosched.provider.ScheduleContract;
+import com.google.android.apps.iosched.util.ActivityHelper;
+import com.google.android.apps.iosched.util.AnalyticsUtils;
+import com.google.android.apps.iosched.util.BitmapUtils;
+import com.google.android.apps.iosched.util.CatchNotesHelper;
+import com.google.android.apps.iosched.util.FractionalTouchDelegate;
+import com.google.android.apps.iosched.util.NotifyingAsyncQueryHandler;
+import com.google.android.apps.iosched.util.UIUtils;
+import com.novoda.droidcon2011.R;
+
 /**
  * A fragment that shows detail information for a session, including session title, abstract,
  * time information, speaker photos and bios, etc.
diff --git a/android-app/src/com/google/android/apps/iosched/ui/SessionsFragment.java b/android-app/src/com/google/android/apps/iosched/ui/SessionsFragment.java
index 5407f06..c9273bc 100644
--- a/android-app/src/com/google/android/apps/iosched/ui/SessionsFragment.java
+++ b/android-app/src/com/google/android/apps/iosched/ui/SessionsFragment.java
@@ -16,13 +16,8 @@
 
 package com.google.android.apps.iosched.ui;
 
-import com.funkyandroid.droidcon2011.R;
-import com.google.android.apps.iosched.provider.ScheduleContract;
-import com.google.android.apps.iosched.util.ActivityHelper;
-import com.google.android.apps.iosched.util.AnalyticsUtils;
-import com.google.android.apps.iosched.util.NotifyingAsyncQueryHandler;
-import com.google.android.apps.iosched.util.UIUtils;
-
+import static com.google.android.apps.iosched.util.UIUtils.buildStyledSnippet;
+import static com.google.android.apps.iosched.util.UIUtils.formatSessionSubtitle;
 import android.content.Context;
 import android.content.Intent;
 import android.database.ContentObserver;
@@ -41,8 +36,12 @@
 import android.widget.ListView;
 import android.widget.TextView;
 
-import static com.google.android.apps.iosched.util.UIUtils.buildStyledSnippet;
-import static com.google.android.apps.iosched.util.UIUtils.formatSessionSubtitle;
+import com.google.android.apps.iosched.provider.ScheduleContract;
+import com.google.android.apps.iosched.util.ActivityHelper;
+import com.google.android.apps.iosched.util.AnalyticsUtils;
+import com.google.android.apps.iosched.util.NotifyingAsyncQueryHandler;
+import com.google.android.apps.iosched.util.UIUtils;
+import com.novoda.droidcon2011.R;
 
 /**
  * A {@link ListFragment} showing a list of sessions.
diff --git a/android-app/src/com/google/android/apps/iosched/ui/StarredActivity.java b/android-app/src/com/google/android/apps/iosched/ui/StarredActivity.java
index 4f57b4f..f9eb5ba 100644
--- a/android-app/src/com/google/android/apps/iosched/ui/StarredActivity.java
+++ b/android-app/src/com/google/android/apps/iosched/ui/StarredActivity.java
@@ -16,12 +16,6 @@
 
 package com.google.android.apps.iosched.ui;
 
-import com.funkyandroid.droidcon2011.R;
-import com.google.android.apps.iosched.provider.ScheduleContract.Sessions;
-import com.google.android.apps.iosched.provider.ScheduleContract.Vendors;
-import com.google.android.apps.iosched.ui.phone.SessionDetailActivity;
-import com.google.android.apps.iosched.ui.phone.VendorDetailActivity;
-
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.FragmentManager;
@@ -32,6 +26,12 @@
 import android.widget.TabWidget;
 import android.widget.TextView;
 
+import com.google.android.apps.iosched.provider.ScheduleContract.Sessions;
+import com.google.android.apps.iosched.provider.ScheduleContract.Vendors;
+import com.google.android.apps.iosched.ui.phone.SessionDetailActivity;
+import com.google.android.apps.iosched.ui.phone.VendorDetailActivity;
+import com.novoda.droidcon2011.R;
+
 /**
  * An activity that shows the user's starred sessions and sandbox companies. This activity can be
  * either single or multi-pane, depending on the device configuration. We want the multi-pane
diff --git a/android-app/src/com/google/android/apps/iosched/ui/TagStreamFragment.java b/android-app/src/com/google/android/apps/iosched/ui/TagStreamFragment.java
index 9a518f6..a768370 100644
--- a/android-app/src/com/google/android/apps/iosched/ui/TagStreamFragment.java
+++ b/android-app/src/com/google/android/apps/iosched/ui/TagStreamFragment.java
@@ -16,7 +16,8 @@
 
 package com.google.android.apps.iosched.ui;
 
-import com.funkyandroid.droidcon2011.R;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 
 import android.content.Intent;
 import android.graphics.Bitmap;
@@ -31,8 +32,7 @@
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
+import com.novoda.droidcon2011.R;
 
 /**
  * A {@link WebView}-based fragment that shows Google Realtime Search results for a given query,
@@ -45,7 +45,7 @@ public class TagStreamFragment extends Fragment {
 
     public static final String EXTRA_QUERY = "com.google.android.iosched.extra.QUERY";
 
-    public static final String CONFERENCE_HASHTAG = "#droidcon";
+    public static final String CONFERENCE_HASHTAG = "#droidconUK";
 
     private String mSearchString;
     private WebView mWebView;
diff --git a/android-app/src/com/google/android/apps/iosched/ui/TracksAdapter.java b/android-app/src/com/google/android/apps/iosched/ui/TracksAdapter.java
index c279911..1bf0443 100644
--- a/android-app/src/com/google/android/apps/iosched/ui/TracksAdapter.java
+++ b/android-app/src/com/google/android/apps/iosched/ui/TracksAdapter.java
@@ -16,9 +16,6 @@
 
 package com.google.android.apps.iosched.ui;
 
-import com.funkyandroid.droidcon2011.R;
-import com.google.android.apps.iosched.provider.ScheduleContract;
-
 import android.app.Activity;
 import android.content.Context;
 import android.database.Cursor;
@@ -30,6 +27,9 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.google.android.apps.iosched.provider.ScheduleContract;
+import com.novoda.droidcon2011.R;
+
 /**
  * A {@link android.widget.CursorAdapter} that renders a {@link TracksQuery}.
  */
diff --git a/android-app/src/com/google/android/apps/iosched/ui/TracksFragment.java b/android-app/src/com/google/android/apps/iosched/ui/TracksFragment.java
index c2bea96..36e02e2 100644
--- a/android-app/src/com/google/android/apps/iosched/ui/TracksFragment.java
+++ b/android-app/src/com/google/android/apps/iosched/ui/TracksFragment.java
@@ -16,11 +16,6 @@
 
 package com.google.android.apps.iosched.ui;
 
-import com.funkyandroid.droidcon2011.R;
-import com.google.android.apps.iosched.provider.ScheduleContract;
-import com.google.android.apps.iosched.util.AnalyticsUtils;
-import com.google.android.apps.iosched.util.NotifyingAsyncQueryHandler;
-
 import android.content.Intent;
 import android.database.Cursor;
 import android.net.Uri;
@@ -31,6 +26,11 @@
 import android.view.ViewGroup;
 import android.widget.ListView;
 
+import com.google.android.apps.iosched.provider.ScheduleContract;
+import com.google.android.apps.iosched.util.AnalyticsUtils;
+import com.google.android.apps.iosched.util.NotifyingAsyncQueryHandler;
+import com.novoda.droidcon2011.R;
+
 /**
  * A simple {@link ListFragment} that renders a list of tracks with available sessions or vendors
  * (depending on {@link TracksFragment#EXTRA_NEXT_TYPE}) using a {@link TracksAdapter}.
diff --git a/android-app/src/com/google/android/apps/iosched/ui/VendorDetailFragment.java b/android-app/src/com/google/android/apps/iosched/ui/VendorDetailFragment.java
index 31355f4..2e500f9 100644
--- a/android-app/src/com/google/android/apps/iosched/ui/VendorDetailFragment.java
+++ b/android-app/src/com/google/android/apps/iosched/ui/VendorDetailFragment.java
@@ -16,16 +16,6 @@
 
 package com.google.android.apps.iosched.ui;
 
-import com.funkyandroid.droidcon2011.R;
-import com.google.android.apps.iosched.provider.ScheduleContract;
-import com.google.android.apps.iosched.util.ActivityHelper;
-import com.google.android.apps.iosched.util.AnalyticsUtils;
-import com.google.android.apps.iosched.util.BitmapUtils;
-import com.google.android.apps.iosched.util.FractionalTouchDelegate;
-import com.google.android.apps.iosched.util.NotifyingAsyncQueryHandler;
-import com.google.android.apps.iosched.util.ParserUtils;
-import com.google.android.apps.iosched.util.UIUtils;
-
 import android.content.ContentValues;
 import android.content.Intent;
 import android.database.Cursor;
@@ -45,6 +35,16 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.google.android.apps.iosched.provider.ScheduleContract;
+import com.google.android.apps.iosched.util.ActivityHelper;
+import com.google.android.apps.iosched.util.AnalyticsUtils;
+import com.google.android.apps.iosched.util.BitmapUtils;
+import com.google.android.apps.iosched.util.FractionalTouchDelegate;
+import com.google.android.apps.iosched.util.NotifyingAsyncQueryHandler;
+import com.google.android.apps.iosched.util.ParserUtils;
+import com.google.android.apps.iosched.util.UIUtils;
+import com.novoda.droidcon2011.R;
+
 /**
  * A fragment that shows detail information for a sandbox company, including company name,
  * description, product description, logo, etc.
diff --git a/android-app/src/com/google/android/apps/iosched/ui/VendorsFragment.java b/android-app/src/com/google/android/apps/iosched/ui/VendorsFragment.java
index ae3d798..f9348dc 100644
--- a/android-app/src/com/google/android/apps/iosched/ui/VendorsFragment.java
+++ b/android-app/src/com/google/android/apps/iosched/ui/VendorsFragment.java
@@ -16,12 +16,7 @@
 
 package com.google.android.apps.iosched.ui;
 
-import com.funkyandroid.droidcon2011.R;
-import com.google.android.apps.iosched.provider.ScheduleContract;
-import com.google.android.apps.iosched.util.ActivityHelper;
-import com.google.android.apps.iosched.util.AnalyticsUtils;
-import com.google.android.apps.iosched.util.NotifyingAsyncQueryHandler;
-
+import static com.google.android.apps.iosched.util.UIUtils.buildStyledSnippet;
 import android.content.Context;
 import android.content.Intent;
 import android.database.ContentObserver;
@@ -39,7 +34,11 @@
 import android.widget.ListView;
 import android.widget.TextView;
 
-import static com.google.android.apps.iosched.util.UIUtils.buildStyledSnippet;
+import com.google.android.apps.iosched.provider.ScheduleContract;
+import com.google.android.apps.iosched.util.ActivityHelper;
+import com.google.android.apps.iosched.util.AnalyticsUtils;
+import com.google.android.apps.iosched.util.NotifyingAsyncQueryHandler;
+import com.novoda.droidcon2011.R;
 
 /**
  * A {@link ListFragment} showing a list of sandbox comapnies.
diff --git a/android-app/src/com/google/android/apps/iosched/ui/WhatsOnFragment.java b/android-app/src/com/google/android/apps/iosched/ui/WhatsOnFragment.java
index 6e4f65f..9af02e5 100644
--- a/android-app/src/com/google/android/apps/iosched/ui/WhatsOnFragment.java
+++ b/android-app/src/com/google/android/apps/iosched/ui/WhatsOnFragment.java
@@ -16,12 +16,6 @@
 
 package com.google.android.apps.iosched.ui;
 
-import com.funkyandroid.droidcon2011.R;
-import com.google.android.apps.iosched.provider.ScheduleContract;
-import com.google.android.apps.iosched.ui.tablet.NowPlayingMultiPaneActivity;
-import com.google.android.apps.iosched.util.AnalyticsUtils;
-import com.google.android.apps.iosched.util.UIUtils;
-
 import android.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
@@ -34,6 +28,12 @@
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import com.google.android.apps.iosched.provider.ScheduleContract;
+import com.google.android.apps.iosched.ui.tablet.NowPlayingMultiPaneActivity;
+import com.google.android.apps.iosched.util.AnalyticsUtils;
+import com.google.android.apps.iosched.util.UIUtils;
+import com.novoda.droidcon2011.R;
+
 /**
  * A fragment used in {@link HomeActivity} that shows either a countdown, 'now playing' link to
  * current sessions, or 'thank you' text, at different times (before/during/after the conference).
diff --git a/android-app/src/com/google/android/apps/iosched/ui/tablet/MapMultiPaneActivity.java b/android-app/src/com/google/android/apps/iosched/ui/tablet/MapMultiPaneActivity.java
index 39cbff0..8b1a8af 100644
--- a/android-app/src/com/google/android/apps/iosched/ui/tablet/MapMultiPaneActivity.java
+++ b/android-app/src/com/google/android/apps/iosched/ui/tablet/MapMultiPaneActivity.java
@@ -16,7 +16,13 @@
 
 package com.google.android.apps.iosched.ui.tablet;
 
-import com.funkyandroid.droidcon2011.R;
+import android.app.FragmentBreadCrumbs;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentTransaction;
+import android.view.View;
+
 import com.google.android.apps.iosched.ui.BaseMultiPaneActivity;
 import com.google.android.apps.iosched.ui.MapFragment;
 import com.google.android.apps.iosched.ui.SessionDetailFragment;
@@ -27,13 +33,7 @@
 import com.google.android.apps.iosched.ui.phone.SessionsActivity;
 import com.google.android.apps.iosched.ui.phone.VendorDetailActivity;
 import com.google.android.apps.iosched.ui.phone.VendorsActivity;
-
-import android.app.FragmentBreadCrumbs;
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
-import android.view.View;
+import com.novoda.droidcon2011.R;
 
 /**
  * A multi-pane activity, where the primary navigation pane is a {@link MapFragment}, that shows
diff --git a/android-app/src/com/google/android/apps/iosched/ui/tablet/NowPlayingMultiPaneActivity.java b/android-app/src/com/google/android/apps/iosched/ui/tablet/NowPlayingMultiPaneActivity.java
index 91c578b..201bff6 100644
--- a/android-app/src/com/google/android/apps/iosched/ui/tablet/NowPlayingMultiPaneActivity.java
+++ b/android-app/src/com/google/android/apps/iosched/ui/tablet/NowPlayingMultiPaneActivity.java
@@ -16,19 +16,19 @@
 
 package com.google.android.apps.iosched.ui.tablet;
 
-import com.funkyandroid.droidcon2011.R;
-import com.google.android.apps.iosched.provider.ScheduleContract.Sessions;
-import com.google.android.apps.iosched.ui.BaseMultiPaneActivity;
-import com.google.android.apps.iosched.ui.SessionDetailFragment;
-import com.google.android.apps.iosched.ui.SessionsFragment;
-import com.google.android.apps.iosched.ui.phone.SessionDetailActivity;
-
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.FragmentManager;
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.google.android.apps.iosched.provider.ScheduleContract.Sessions;
+import com.google.android.apps.iosched.ui.BaseMultiPaneActivity;
+import com.google.android.apps.iosched.ui.SessionDetailFragment;
+import com.google.android.apps.iosched.ui.SessionsFragment;
+import com.google.android.apps.iosched.ui.phone.SessionDetailActivity;
+import com.novoda.droidcon2011.R;
+
 /**
  * An activity that shows currently playing sessions in a two-pane view.
  */
diff --git a/android-app/src/com/google/android/apps/iosched/ui/tablet/ScheduleMultiPaneActivity.java b/android-app/src/com/google/android/apps/iosched/ui/tablet/ScheduleMultiPaneActivity.java
index ce1068b..edd3b9d 100644
--- a/android-app/src/com/google/android/apps/iosched/ui/tablet/ScheduleMultiPaneActivity.java
+++ b/android-app/src/com/google/android/apps/iosched/ui/tablet/ScheduleMultiPaneActivity.java
@@ -16,13 +16,6 @@
 
 package com.google.android.apps.iosched.ui.tablet;
 
-import com.funkyandroid.droidcon2011.R;
-import com.google.android.apps.iosched.ui.BaseMultiPaneActivity;
-import com.google.android.apps.iosched.ui.SessionDetailFragment;
-import com.google.android.apps.iosched.ui.SessionsFragment;
-import com.google.android.apps.iosched.ui.phone.SessionDetailActivity;
-import com.google.android.apps.iosched.ui.phone.SessionsActivity;
-
 import android.app.FragmentBreadCrumbs;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
@@ -31,6 +24,13 @@
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.google.android.apps.iosched.ui.BaseMultiPaneActivity;
+import com.google.android.apps.iosched.ui.SessionDetailFragment;
+import com.google.android.apps.iosched.ui.SessionsFragment;
+import com.google.android.apps.iosched.ui.phone.SessionDetailActivity;
+import com.google.android.apps.iosched.ui.phone.SessionsActivity;
+import com.novoda.droidcon2011.R;
+
 /**
  * A multi-pane activity, where the primary navigation pane is a
  * {@link com.google.android.apps.iosched.ui.ScheduleFragment}, that
diff --git a/android-app/src/com/google/android/apps/iosched/ui/tablet/SessionsMultiPaneActivity.java b/android-app/src/com/google/android/apps/iosched/ui/tablet/SessionsMultiPaneActivity.java
index fbfe41c..fcdbf73 100644
--- a/android-app/src/com/google/android/apps/iosched/ui/tablet/SessionsMultiPaneActivity.java
+++ b/android-app/src/com/google/android/apps/iosched/ui/tablet/SessionsMultiPaneActivity.java
@@ -16,7 +16,11 @@
 
 package com.google.android.apps.iosched.ui.tablet;
 
-import com.funkyandroid.droidcon2011.R;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v4.app.FragmentManager;
+import android.view.ViewGroup;
+
 import com.google.android.apps.iosched.provider.ScheduleContract;
 import com.google.android.apps.iosched.ui.BaseMultiPaneActivity;
 import com.google.android.apps.iosched.ui.SessionDetailFragment;
@@ -24,15 +28,11 @@
 import com.google.android.apps.iosched.ui.TracksFragment;
 import com.google.android.apps.iosched.ui.phone.SessionDetailActivity;
 import com.google.android.apps.iosched.ui.phone.SessionsActivity;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.v4.app.FragmentManager;
-import android.view.ViewGroup;
+import com.novoda.droidcon2011.R;
 
 /**
  * A multi-pane activity, consisting of a {@link TracksDropdownFragment}, a
- * {@link SessionsFragment}, and {@link SessionDetailFragment}.
+ * {@link SessionsFragment}, and {@link S
  *
  * This activity requires API level 11 or greater because {@link TracksDropdownFragment} requires
  * API level 11.
diff --git a/android-app/src/com/google/android/apps/iosched/ui/tablet/TracksDropdownFragment.java b/android-app/src/com/google/android/apps/iosched/ui/tablet/TracksDropdownFragment.java
index 6101031..13f239a 100644
--- a/android-app/src/com/google/android/apps/iosched/ui/tablet/TracksDropdownFragment.java
+++ b/android-app/src/com/google/android/apps/iosched/ui/tablet/TracksDropdownFragment.java
@@ -16,15 +16,6 @@
 
 package com.google.android.apps.iosched.ui.tablet;
 
-import com.funkyandroid.droidcon2011.R;
-import com.google.android.apps.iosched.provider.ScheduleContract;
-import com.google.android.apps.iosched.ui.BaseActivity;
-import com.google.android.apps.iosched.ui.SessionDetailFragment;
-import com.google.android.apps.iosched.ui.TracksAdapter;
-import com.google.android.apps.iosched.ui.TracksFragment;
-import com.google.android.apps.iosched.util.NotifyingAsyncQueryHandler;
-import com.google.android.apps.iosched.util.UIUtils;
-
 import android.content.Intent;
 import android.content.res.Resources;
 import android.database.Cursor;
@@ -39,6 +30,15 @@
 import android.widget.PopupWindow;
 import android.widget.TextView;
 
+import com.google.android.apps.iosched.provider.ScheduleContract;
+import com.google.android.apps.iosched.ui.BaseActivity;
+import com.google.android.apps.iosched.ui.SessionDetailFragment;
+import com.google.android.apps.iosched.ui.TracksAdapter;
+import com.google.android.apps.iosched.ui.TracksFragment;
+import com.google.android.apps.iosched.util.NotifyingAsyncQueryHandler;
+import com.google.android.apps.iosched.util.UIUtils;
+import com.novoda.droidcon2011.R;
+
 /**
  * A tablet-specific fragment that is a giant {@link android.widget.Spinner}-like widget. It shows
  * a {@link ListPopupWindow} containing a list of tracks, using {@link TracksAdapter}.
diff --git a/android-app/src/com/google/android/apps/iosched/ui/tablet/VendorsMultiPaneActivity.java b/android-app/src/com/google/android/apps/iosched/ui/tablet/VendorsMultiPaneActivity.java
index 8d7e841..91e32bd 100644
--- a/android-app/src/com/google/android/apps/iosched/ui/tablet/VendorsMultiPaneActivity.java
+++ b/android-app/src/com/google/android/apps/iosched/ui/tablet/VendorsMultiPaneActivity.java
@@ -16,7 +16,11 @@
 
 package com.google.android.apps.iosched.ui.tablet;
 
-import com.funkyandroid.droidcon2011.R;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v4.app.FragmentManager;
+import android.view.ViewGroup;
+
 import com.google.android.apps.iosched.provider.ScheduleContract;
 import com.google.android.apps.iosched.ui.BaseMultiPaneActivity;
 import com.google.android.apps.iosched.ui.TracksFragment;
@@ -24,11 +28,7 @@
 import com.google.android.apps.iosched.ui.VendorsFragment;
 import com.google.android.apps.iosched.ui.phone.VendorDetailActivity;
 import com.google.android.apps.iosched.ui.phone.VendorsActivity;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.v4.app.FragmentManager;
-import android.view.ViewGroup;
+import com.novoda.droidcon2011.R;
 
 /**
  * A multi-pane activity, consisting of a {@link TracksDropdownFragment}, a
diff --git a/android-app/src/com/google/android/apps/iosched/ui/widget/BezelImageView.java b/android-app/src/com/google/android/apps/iosched/ui/widget/BezelImageView.java
index a213cb1..64278a9 100644
--- a/android-app/src/com/google/android/apps/iosched/ui/widget/BezelImageView.java
+++ b/android-app/src/com/google/android/apps/iosched/ui/widget/BezelImageView.java
@@ -16,8 +16,6 @@
 
 package com.google.android.apps.iosched.ui.widget;
 
-import com.funkyandroid.droidcon2011.R;
-
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
@@ -30,6 +28,8 @@
 import android.util.AttributeSet;
 import android.widget.ImageView;
 
+import com.novoda.droidcon2011.R;
+
 /**
  * An {@link ImageView} that draws its contents inside a mask and draws a border drawable on top.
  * This is useful for applying a beveled look to image contents, but is also flexible enough for use
diff --git a/android-app/src/com/google/android/apps/iosched/ui/widget/BlockView.java b/android-app/src/com/google/android/apps/iosched/ui/widget/BlockView.java
index 76f92c8..cdd0f19 100644
--- a/android-app/src/com/google/android/apps/iosched/ui/widget/BlockView.java
+++ b/android-app/src/com/google/android/apps/iosched/ui/widget/BlockView.java
@@ -16,9 +16,7 @@
 
 package com.google.android.apps.iosched.ui.widget;
 
-import com.funkyandroid.droidcon2011.R;
-import com.google.android.apps.iosched.provider.ScheduleContract.Blocks;
-import com.google.android.apps.iosched.util.UIUtils;
+import java.util.TimeZone;
 
 import android.content.Context;
 import android.graphics.Color;
@@ -27,7 +25,9 @@
 import android.text.format.DateUtils;
 import android.widget.Button;
 
-import java.util.TimeZone;
+import com.google.android.apps.iosched.provider.ScheduleContract.Blocks;
+import com.google.android.apps.iosched.util.UIUtils;
+import com.novoda.droidcon2011.R;
 
 /**
  * Custom view that represents a {@link Blocks#BLOCK_ID} instance, including its
diff --git a/android-app/src/com/google/android/apps/iosched/ui/widget/BlocksLayout.java b/android-app/src/com/google/android/apps/iosched/ui/widget/BlocksLayout.java
index 82ce772..e1b14a4 100644
--- a/android-app/src/com/google/android/apps/iosched/ui/widget/BlocksLayout.java
+++ b/android-app/src/com/google/android/apps/iosched/ui/widget/BlocksLayout.java
@@ -16,15 +16,15 @@
 
 package com.google.android.apps.iosched.ui.widget;
 
-import com.funkyandroid.droidcon2011.R;
-import com.google.android.apps.iosched.util.UIUtils;
-
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.google.android.apps.iosched.util.UIUtils;
+import com.novoda.droidcon2011.R;
+
 /**
  * Custom layout that contains and organizes a {@link TimeRulerView} and several
  * instances of {@link BlockView}. Also positions current "now" divider using
diff --git a/android-app/src/com/google/android/apps/iosched/ui/widget/TimeRulerView.java b/android-app/src/com/google/android/apps/iosched/ui/widget/TimeRulerView.java
index 11d4b2c..7477604 100644
--- a/android-app/src/com/google/android/apps/iosched/ui/widget/TimeRulerView.java
+++ b/android-app/src/com/google/android/apps/iosched/ui/widget/TimeRulerView.java
@@ -16,9 +16,6 @@
 
 package com.google.android.apps.iosched.ui.widget;
 
-import com.funkyandroid.droidcon2011.R;
-import com.google.android.apps.iosched.util.UIUtils;
-
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
@@ -31,6 +28,9 @@
 import android.util.AttributeSet;
 import android.view.View;
 
+import com.google.android.apps.iosched.util.UIUtils;
+import com.novoda.droidcon2011.R;
+
 /**
  * Custom view that draws a vertical time "ruler" representing the chronological
  * progression of a single day. Usually shown along with {@link BlockView}
diff --git a/android-app/src/com/google/android/apps/iosched/util/ActivityHelper.java b/android-app/src/com/google/android/apps/iosched/util/ActivityHelper.java
index dffac1a..01bd694 100644
--- a/android-app/src/com/google/android/apps/iosched/util/ActivityHelper.java
+++ b/android-app/src/com/google/android/apps/iosched/util/ActivityHelper.java
@@ -16,9 +16,6 @@
 
 package com.google.android.apps.iosched.util;
 
-import com.funkyandroid.droidcon2011.R;
-import com.google.android.apps.iosched.ui.HomeActivity;
-
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
@@ -34,6 +31,9 @@
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import com.google.android.apps.iosched.ui.HomeActivity;
+import com.novoda.droidcon2011.R;
+
 /**
  * A class that handles some common activity-related functionality in the app, such as setting up
  * the action bar. This class provides functioanlity useful for both phones and tablets, and does
diff --git a/android-app/src/com/google/android/apps/iosched/util/ActivityHelperHoneycomb.java b/android-app/src/com/google/android/apps/iosched/util/ActivityHelperHoneycomb.java
index c8bb91c..cc06e15 100644
--- a/android-app/src/com/google/android/apps/iosched/util/ActivityHelperHoneycomb.java
+++ b/android-app/src/com/google/android/apps/iosched/util/ActivityHelperHoneycomb.java
@@ -16,14 +16,14 @@
 
 package com.google.android.apps.iosched.util;
 
-import com.funkyandroid.droidcon2011.R;
-
 import android.app.ActionBar;
 import android.app.Activity;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
 
+import com.novoda.droidcon2011.R;
+
 /**
  * An extension of {@link ActivityHelper} that provides Android 3.0-specific functionality for
  * Honeycomb tablets. It thus requires API level 11.
diff --git a/android-app/src/com/google/android/apps/iosched/util/CatchNotesHelper.java b/android-app/src/com/google/android/apps/iosched/util/CatchNotesHelper.java
index b023e87..7dd75d4 100644
--- a/android-app/src/com/google/android/apps/iosched/util/CatchNotesHelper.java
+++ b/android-app/src/com/google/android/apps/iosched/util/CatchNotesHelper.java
@@ -16,8 +16,6 @@
 
 package com.google.android.apps.iosched.util;
 
-import com.funkyandroid.droidcon2011.R;
-
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
@@ -25,6 +23,8 @@
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.net.Uri;
 
+import com.novoda.droidcon2011.R;
+
 /**
  * Helper class for the Catch Notes integration, based on example code at
  * {@link https://github.com/catch/docs-api/}.
diff --git a/android-app/src/com/google/android/apps/iosched/util/EulaHelper.java b/android-app/src/com/google/android/apps/iosched/util/EulaHelper.java
index 7fd5717..cbd4f70 100644
--- a/android-app/src/com/google/android/apps/iosched/util/EulaHelper.java
+++ b/android-app/src/com/google/android/apps/iosched/util/EulaHelper.java
@@ -16,8 +16,6 @@
 
 package com.google.android.apps.iosched.util;
 
-import com.funkyandroid.droidcon2011.R;
-
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Context;
@@ -26,6 +24,8 @@
 import android.os.AsyncTask;
 import android.preference.PreferenceManager;
 
+import com.novoda.droidcon2011.R;
+
 /**
  * A helper for showing EULAs and storing a {@link SharedPreferences} bit indicating whether the
  * user has accepted.
diff --git a/android-app/src/com/google/android/apps/iosched/util/UIUtils.java b/android-app/src/com/google/android/apps/iosched/util/UIUtils.java
index 2b2bd0f..0b7ddbc 100644
--- a/android-app/src/com/google/android/apps/iosched/util/UIUtils.java
+++ b/android-app/src/com/google/android/apps/iosched/util/UIUtils.java
@@ -16,12 +16,10 @@
 
 package com.google.android.apps.iosched.util;
 
-import com.funkyandroid.droidcon2011.R;
-import com.google.android.apps.iosched.provider.ScheduleContract.Blocks;
-import com.google.android.apps.iosched.provider.ScheduleContract.Rooms;
-import com.google.android.apps.iosched.ui.phone.MapActivity;
-import com.google.android.apps.iosched.ui.tablet.MapMultiPaneActivity;
+import java.util.List;
+import java.util.TimeZone;
 
+import novoda.droidcon.ui.AboutActivity;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -45,10 +43,11 @@
 import android.text.style.StyleSpan;
 import android.widget.TextView;
 
-import java.util.List;
-import java.util.TimeZone;
-
-import novoda.droidcon.ui.AboutActivity;
+import com.google.android.apps.iosched.provider.ScheduleContract.Blocks;
+import com.google.android.apps.iosched.provider.ScheduleContract.Rooms;
+import com.google.android.apps.iosched.ui.phone.MapActivity;
+import com.google.android.apps.iosched.ui.tablet.MapMultiPaneActivity;
+import com.novoda.droidcon2011.R;
 
 /**
  * An assortment of UI helpers.
diff --git a/android-app/src/novoda/droidcon/homewidget/CountdownWidget.java b/android-app/src/novoda/droidcon/homewidget/CountdownWidget.java
index 2ef5d0b..4a1d947 100644
--- a/android-app/src/novoda/droidcon/homewidget/CountdownWidget.java
+++ b/android-app/src/novoda/droidcon/homewidget/CountdownWidget.java
@@ -1,8 +1,5 @@
 package novoda.droidcon.homewidget;
 
-import com.funkyandroid.droidcon2011.R;
-import com.google.android.apps.iosched.ui.HomeActivity;
-import com.google.android.apps.iosched.util.UIUtils;
 import android.app.AlarmManager;
 import android.app.PendingIntent;
 import android.app.Service;
@@ -15,6 +12,10 @@
 import android.os.SystemClock;
 import android.widget.RemoteViews;
 
+import com.google.android.apps.iosched.ui.HomeActivity;
+import com.google.android.apps.iosched.util.UIUtils;
+import com.novoda.droidcon2011.R;
+
 
 public class CountdownWidget extends AppWidgetProvider {
 
diff --git a/android-app/src/novoda/droidcon/ui/AboutFragment.java b/android-app/src/novoda/droidcon/ui/AboutFragment.java
index 48e1bcd..d391266 100644
--- a/android-app/src/novoda/droidcon/ui/AboutFragment.java
+++ b/android-app/src/novoda/droidcon/ui/AboutFragment.java
@@ -12,9 +12,9 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.funkyandroid.droidcon2011.R;
 import com.google.android.apps.iosched.util.ActivityHelper;
 import com.google.android.apps.iosched.util.UIUtils;
+import com.novoda.droidcon2011.R;
 
 public class AboutFragment extends Fragment {
 
@@ -65,7 +65,7 @@ public void onClick(View v) {
 					startActivity( new Intent( Intent.ACTION_VIEW, Uri.parse( "http://mobile.twitter.com/droidconuk" )));
 					break;
 				case R.id.about_twitter_hashtag: 
-					startActivity( new Intent( Intent.ACTION_VIEW, Uri.parse( "http://mobile.twitter.com/searches?q=%23droidcon" )));
+					startActivity( new Intent( Intent.ACTION_VIEW, Uri.parse( "http://mobile.twitter.com/searches?q=%23droidconuk" )));
 					break;
 				case R.id.about_sponsors_orange: 
 					startActivity( new Intent( Intent.ACTION_VIEW, Uri.parse( "http://www.orangepartner.com/site/enuk/home/p_home.jsp" )));