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