not ignore dist directory
delete gitignore file
add css and js for bootstrap-select plugin
一对多。多对一
用户管理
Merge branch 'master' of https://github.com/yaomj/wasu-rmss

Conflicts:
	rmss/app/Global.java
	rmss/app/controllers/Application.java
	rmss/app/views/area_list.scala.html
	rmss/conf/evolutions/default/1.sql
	rmss/conf/init-data.yml
	rmss/conf/routes
用户修改
用户修改
下拉框修改
ups add
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
Merge branch 'master' of https://github.com/qianyu09/wasu-rmss into qianyu09-master

Conflicts:
	rmss/app/views/area_list.scala.html
	rmss/conf/application.conf
	rmss/conf/evolutions/default/1.sql
	rmss/conf/routes
Merge branch 'qianyu09-master'
解决错误
1
Merge remote-tracking branch 'upstream/master'

Conflicts:
	rmss/app/controllers/Application.java
	rmss/conf/evolutions/default/1.sql
	rmss/conf/init-data.yml
	rmss/conf/routes
unit test good
Rename AirSwitchconfigurationChoice.java to AirSwitchConfigurationChoice.java
Rename local.java to Local.java
delete wrong  import