自动代码生成 0.01
Merge branch 'master' of github.com:qriver/springside_test

Conflicts:
	rapid-generator/template/springmvc_rest/web/pages/${classNameLowerCase}/create.jsp