解决合并冲突的问题
Merge branch 'master' of https://github.com/yaomj/wasu-rmss into yaomj-master

Conflicts:
	rmss/project/target/streams/compile/compile/$global/out
	rmss/project/target/streams/compile/copyResources/$global/out
	rmss/target/streams/compile/unmanagedJars/$global/export
	rmss/target/streams/test/unmanagedClasspath/$global/export
	rmss/target/streams/test/unmanagedJars/$global/export
Merge branch 'yaomj-master'
Merge branch 'master' of https://github.com/yaomj/wasu-rmss

Conflicts:
	rmss/conf/routes
add css library
ui 框架
Merge remote-tracking branch 'upstream/master'

Conflicts:
	rmss/app/views/add_registered.scala.html
	rmss/app/views/main.scala.html
	rmss/target/scala-2.10/classes_managed/views/html/main$$anonfun$f$1$$anonfun$apply$1.class