3,9,11,12
Merge branch 'master' of https://github.com/DormitoryTeam/Dormitory

Conflicts:
	src/main/java/com/noeasy/money/admin/controller/AdminDormitoryController.java
	src/main/webapp/WEB-INF/jsp/admin/dormitory/dormitory-edit.jsp