no message
Merge commit 'e5a3e5d4de2e57653cc653b0ab96fd822956ceac'

Conflicts:
	LivePPT/conf/application.conf
	LivePPT/doc/LivePPT-面向App接口文档.doc