实现由android->unix->win上的连接转换
恢复上传ppt时的用户验证
Merge remote-tracking branch 'origin/DEV-LWJ'

Conflicts:
	LivePPT/app/models/PPTService.java