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
修改 数据库密码和upstream
区域管理添加删除
区域添加删除修改
修改前期界面
Merge branch 'master' of https://github.com/yaomj/wasu-rmss
更新
Merge branch 'master' of https://github.com/yaomj/wasu-rmss