fix ui bug
Merge branch 'master' of https://github.com/DormitoryTeam/Dormitory

Conflicts:
	src/main/webapp/WEB-INF/jsp/admin/site/admin-navigation.jsp
	src/main/webapp/WEB-INF/jsp/dormitory/include/dormitorydetail-comment.jsp
	src/main/webapp/WEB-INF/jsp/dormitory/include/dormitorylist-list.jsp
	src/main/webapp/WEB-INF/jsp/navigation/include/citynavigation-citylist.jsp