update
Merge branch 'master' of https://github.com/xwjchina/android.git

Conflicts:
	xclient/src/org/xwjchina/xclient/MainActivity.java