1
update
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
upload
ready for deploy to test server
客户资源管理
不在上传1.sql文件
no message
Merge branch 'master' of git://github.com/daipp/wasu-rmss into daipp-master

Conflicts:
	rmss/app/controllers/Application.java
	rmss/app/views/main.scala.html
	rmss/conf/application.conf
	rmss/conf/routes
Merge branch 'daipp-master'
finishi the work of VLANResource