下拉菜单
用户注册区域可以提交到数据库
编写数据库
Merge remote-tracking branch 'upstream/master'

Conflicts:
	rmss/app/views/add_registered.scala.html
	rmss/app/views/main.scala.html
	rmss/target/scala-2.10/classes_managed/views/html/main$$anonfun$f$1$$anonfun$apply$1.class
Merge remote-tracking branch 'upstream/master'

Conflicts:
	rmss/conf/application.conf
	rmss/conf/evolutions/default/1.sql
	rmss/public/AdminLTE/css/AdminLTE.css
Merge remote-tracking branch 'upstream/master'
room type curd
machine_room functions
update parameter
no message
Merge pull request #7 from yaomj/master

添加
机房设备
Merge branch 'master' of github.com:caogy8888/wasu-rmss
init data
机房设备
ups attachment model
figure out the conflict