删除无用文件
Merge branch 'master' of https://github.com/yaomj/wasu-rmss
Merge branch 'master' of https://github.com/yaomj/wasu-rmss
ready for deploy to test server
ip地址总体规划
ip地址管理
不在上传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'
客户资源管理