finished beta ver1.0
Merge branch 'master' of https://github.com/xianrendzw/EasyReport

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