用户修改
用户修改
下拉框修改
Merge branch 'master' of https://github.com/yaomj/wasu-rmss

Conflicts:
	rmss/app/controllers/Application.java
	rmss/app/views/list_room.scala.html
	rmss/conf/evolutions/default/1.sql
	rmss/conf/routes