update
upload
finishi the work of VLANResource
add local database to default  package
Merge branch 'master' of git://github.com/qianyu09/wasu-rmss

Conflicts:
	rmss/app/controllers/MalFunction.java
	rmss/conf/evolutions/default/1.sql
	rmss/conf/routes
	rmss/target/scala-2.10/src_managed/main/controllers/routes.java
	rmss/target/scala-2.10/src_managed/main/routes_reverseRouting.scala
	rmss/target/scala-2.10/src_managed/main/routes_routing.scala