由，最新上传
刘洋最新版本
Merge remote-tracking branch 'origin/liu' into liu

Conflicts:
	project.properties
你好
Merge branch 'master' of https://github.com/fengsaofly/HandWrite

Conflicts:
	res/layout/chat_input_field.xml
	res/layout/question_reply.xml
	src/scu/android/ui/ThumbnailsAdapter.java