update at 12/25
Merge remote-tracking branch 'upstream/master'

Conflicts:
	rmss/conf/evolutions/default/1.sql
	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
update 12/29 VLANSResource is done already
fix conflicts
delete db files
ignore file
Merge branch 'qianyu09-master'
delete db file