diff --git a/.gitignore b/.gitignore
index 1ebeb7c53..689080dce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ org.eclipse.ltk.core.refactoring.prefs
 gen
 local.properties
 ecbuild
+astrid/bin
 dev
 lp-translations/
 
diff --git a/astrid/AndroidManifest.xml b/astrid/AndroidManifest.xml
index 2497b6575..c4e9549b4 100644
--- a/astrid/AndroidManifest.xml
+++ b/astrid/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.timsu.astrid"
-          android:versionName="3.2.7 (bug fixes and ui improvements)" 
-          android:versionCode="154">
+          android:versionName="3.3.0 (Google Tasks! and bug fixes)" 
+          android:versionCode="155">
           
   <!-- widgets, alarms, and services will break if Astrid is installed on SD card -->
   <!--    android:installLocation="internalOnly"> -->
diff --git a/astrid/antlib/ant-contrib-1.0b3.jar b/astrid/antlib/ant-contrib-1.0b3.jar
new file mode 100644
index 000000000..062537661
Binary files /dev/null and b/astrid/antlib/ant-contrib-1.0b3.jar differ
diff --git a/astrid/build.properties b/astrid/build.properties
new file mode 100644
index 000000000..b6d26cddc
--- /dev/null
+++ b/astrid/build.properties
@@ -0,0 +1,11 @@
+# Astrid build properties
+
+# output files and apk
+out.dir=bin
+
+# source directory must be underneath output directory
+# because we pull in from multiple source folders
+source.dir=${out.dir}/source
+
+# Astrid source folders
+astrid.sources=src,common-src,plugin-src,src-legacy
\ No newline at end of file
diff --git a/astrid/build.xml b/astrid/build.xml
new file mode 100644
index 000000000..ff817d0eb
--- /dev/null
+++ b/astrid/build.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="TaskListActivity" default="help">
+
+    <!-- The local.properties file is created and updated by the 'android' tool.
+         It contains the path to the SDK. It should *NOT* be checked in in Version
+         Control Systems. -->
+    <property file="local.properties" />
+
+    <!-- The build.properties file can be created by you and is never touched
+         by the 'android' tool. This is the place to change some of the default property values
+         used by the Ant rules.
+         Here are some properties you may want to change/update:
+
+         application.package
+             the name of your application package as defined in the manifest. Used by the
+             'uninstall' rule.
+         source.dir
+             the name of the source directory. Default is 'src'.
+         out.dir
+             the name of the output directory. Default is 'bin'.
+
+         Properties related to the SDK location or the project target should be updated
+          using the 'android' tool with the 'update' action.
+
+         This file is an integral part of the build system for your application and
+         should be checked in in Version Control Systems.
+
+         -->
+    <property file="build.properties" />
+
+    <!-- The default.properties file is created and updated by the 'android' tool, as well
+         as ADT.
+         This file is an integral part of the build system for your application and
+         should be checked in in Version Control Systems. -->
+    <property file="default.properties" />
+
+    <!-- Custom Android task to deal with the project target, and import the proper rules.
+         This requires ant 1.6.0 or above. -->
+    <path id="android.antlibs">
+        <pathelement path="${sdk.dir}/tools/lib/anttasks.jar" />
+        <pathelement path="${sdk.dir}/tools/lib/sdklib.jar" />
+        <pathelement path="${sdk.dir}/tools/lib/androidprefs.jar" />
+        <pathelement path="${sdk.dir}/tools/lib/apkbuilder.jar" />
+        <pathelement path="${sdk.dir}/tools/lib/jarutils.jar" />
+    </path>
+
+    <taskdef name="setup"
+        classname="com.android.ant.SetupTask"
+        classpathref="android.antlibs" />
+
+    <!-- Execute the Android Setup task that will setup some properties specific to the target,
+         and import the build rules files.
+
+         The rules file is imported from
+            <SDK>/platforms/<target_platform>/templates/android_rules.xml
+
+         To customize some build steps for your project:
+         - copy the content of the main node <project> from android_rules.xml
+         - paste it in this build.xml below the <setup /> task.
+         - disable the import by changing the setup task below to <setup import="false" />
+
+         This will ensure that the properties are setup correctly but that your customized
+         build steps are used.
+    -->
+    <setup />
+
+    <taskdef resource="net/sf/antcontrib/antlib.xml">
+      <classpath>
+        <pathelement location="antlib/ant-contrib-1.0b3.jar"/>
+      </classpath>
+    </taskdef>
+
+    <!-- amalgamate sources -->
+    <delete dir="${source.dir}" />
+    <mkdir dir="${source.dir}" />
+    <for list="${astrid.sources}" param="dir">
+      <sequential>
+        <copy todir="${source.dir}">
+          <fileset dir="@{dir}" />
+        </copy>
+      </sequential>
+    </for>
+
+</project>
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
index 95d742038..326b6b930 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
@@ -671,7 +671,7 @@ public final class TaskEditActivity extends TabActivity {
 
                 StringBuilder label = new StringBuilder();
                 if(ProducteevUtilities.INSTANCE.isLoggedIn())
-                    label.append(5 - i).append("\n★"); //$NON-NLS-1$
+                    label.append(5 - i).append("\n\u2605"); //$NON-NLS-1$
                 else {
                     for(int j = importanceOffset; j >= i; j--)
                         label.append('!');