添加视频预览功能
Merge branch 'master' of github.com:thettian/aws-mybatis

Conflicts:
	aws-mybatis/WebContent/WEB-INF/jsp/listinfo.jsp
	aws-mybatis/WebContent/resource/js/listinfo.js
	aws-mybatis/src/com/thettian/service/s3manage/S3Service.java