1017
Merge branch 'master' of https://github.com/tangxin983/framework

Conflicts:
	dining/src/main/webapp/WEB-INF/views/resource/resourceList.jsp