Merge branch 'setup_colors' into setup_app_name

res/layout-land/account_setup.xml

@@ -189,6 +189,7 @@
 		android:id="@id/buttonOK"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
+		android:background="@android:drawable/btn_default"
 		android:layout_above="@id/account_register"
 		android:layout_centerHorizontal="true"
 		android:enabled="false"

res/layout/account_setup.xml

@@ -170,6 +170,7 @@
             android:id="@+id/buttonOK"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="@android:drawable/btn_default"
             android:layout_gravity="center_horizontal"
             android:enabled="false"
             android:onClick="onOkClick"