增加邮件查看
Merge branch 'master' of
https://github.com/FreeTech-Official/GreenwaveCRM

Conflicts:
	src/main/webapp/WEB-INF/views/index.jsp