Client
Merge branch 'master' of https://github.com/pengj/KitchenChat

Conflicts:
	.DS_Store
	android-user/res/drawable-hdpi/ic_launcher.png
	android-user/res/values/strings.xml