Merge branch 'dev'

* dev:
  删去没有必要的登陆返回字段
  首页添加标题LivePPT
还原远程数据库连接信息
增加login register接口状态码信息
no message
Merge commit 'e5a3e5d4de2e57653cc653b0ab96fd822956ceac'

Conflicts:
	LivePPT/conf/application.conf
	LivePPT/doc/LivePPT-面向App接口文档.doc
Merge branch 'master' into dev