Merge remote-tracking branch 'origin/background'

Conflicts:
	CUTEn/res/layout/main.xml
	QA/src/jp/ac/titech/sharp4k/cuten/QAActivity.java
	QA/src/jp/ac/titech/sharp4k/cuten/sampletask/QATask.java

diff --cc CUTEn/res/layout/main.xml
index 08d88af,adca17b..0e0a5b1
--- 1/CUTEn/res/layout/main.xml
--- 2/CUTEn/res/layout/main.xml
+++ b/CUTEn/res/layout/main.xml
@@@ -18,10 -22,13 +18,10 @@@
                  android:id="@+id/MessageTextView"
                  android:layout_width="wrap_content"
                  android:layout_height="match_parent"
 -                android:layout_weight="0.15"
 -                android:text="Large Text"
                  android:textAppearance="?android:attr/textAppearanceLarge" />
 -
          </LinearLayout>
  
-         <Button
+         <ImageButton
              android:id="@+id/clearFlagBtn"
              android:layout_width="wrap_content"
              android:layout_height="wrap_content"
@@@ -37,15 -44,18 +37,16 @@@
              android:id="@+id/updateBtn"
              android:layout_width="wrap_content"
              android:layout_height="wrap_content"
-             android:text="@string/panda_update_button_label" />
+             android:src="@drawable/reload32" />
 -        
 +
-         <Button
+         <ImageButton
              android:id="@+id/moveBtn"
              android:layout_width="wrap_content"
              android:layout_height="wrap_content"
              android:layout_weight="0.01"
-             android:text="@string/panda_to_down_button_label" />
+             android:src="@drawable/addlec32" />
 -        
 -    </LinearLayout>
 -
+ 
 +    </LinearLayout>
  
      <ExpandableListView
          android:id="@+id/folderList"

diff --cc QA/src/jp/ac/titech/sharp4k/cuten/QAActivity.java
index 237de91,c41c935..d0bd899
--- 1/QA/src/jp/ac/titech/sharp4k/cuten/QAActivity.java
--- 2/QA/src/jp/ac/titech/sharp4k/cuten/QAActivity.java
+++ b/QA/src/jp/ac/titech/sharp4k/cuten/QAActivity.java
@@@ -49,4 -50,4 +49,4 @@@ public class QAActivity extends Activit
                Toast.makeText(this, str, Toast.LENGTH_SHORT).show();
                // Log.d(TAG, "requested to send: " + str);
        }
--}
++}