1
Merge branch 'master' of https://github.com/qiaohe/CCBN_Android

Conflicts:
	gen/com/exhibition/R.java
	res/layout/activity_qrcode.xml
	src/com/exhibition/netty/client/ClientHandler.java
add exhibitorDetailActivity title
no message
add video function