增加客户端
Merge branch 'master' of https://github.com/stardust1900/reading-party

Conflicts:
	client/android/AndroidManifest.xml
	client/android/ic_launcher-web.png
	client/android/libs/android-support-v4.jar
	client/android/proguard-project.txt
	client/android/project.properties
	client/android/res/drawable-hdpi/ic_launcher.png
	client/android/res/drawable-mdpi/ic_launcher.png
	client/android/res/drawable-xhdpi/ic_launcher.png
	client/android/res/drawable-xxhdpi/ic_launcher.png
	client/android/res/values-v11/styles.xml
	client/android/res/values-v14/styles.xml
	client/android/res/values/strings.xml
	client/android/res/values/styles.xml