Merge remote-tracking branch 'upstream/master'

Conflicts:
	rmss/.idea/workspace.xml
	rmss/project/target/resolution-cache/default/rmss-build/scala_2.10/sbt_0.13/0.1-SNAPSHOT/resolved.xml.properties
	rmss/project/target/resolution-cache/default/rmss-build/scala_2.10/sbt_0.13/0.1-SNAPSHOT/resolved.xml.xml
	rmss/project/target/resolution-cache/reports/default-rmss-build-compile-internal.xml
	rmss/project/target/resolution-cache/reports/default-rmss-build-compile.xml
	rmss/project/target/resolution-cache/reports/default-rmss-build-docs.xml
	rmss/project/target/resolution-cache/reports/default-rmss-build-optional.xml
	rmss/project/target/resolution-cache/reports/default-rmss-build-plugin.xml
	rmss/project/target/resolution-cache/reports/default-rmss-build-pom.xml
	rmss/project/target/resolution-cache/reports/default-rmss-build-provided.xml
	rmss/project/target/resolution-cache/reports/default-rmss-build-runtime-internal.xml
	rmss/project/target/resolution-cache/reports/default-rmss-build-runtime.xml
	rmss/project/target/resolution-cache/reports/default-rmss-build-scala-tool.xml
	rmss/project/target/resolution-cache/reports/default-rmss-build-sources.xml
	rmss/project/target/resolution-cache/reports/default-rmss-build-test-internal.xml
	rmss/project/target/resolution-cache/reports/default-rmss-build-test.xml
	rmss/project/target/streams/$global/ivyConfiguration/$global/out
	rmss/project/target/streams/$global/update/$global/inputs
	rmss/project/target/streams/$global/update/$global/out
	rmss/project/target/streams/$global/update/$global/output
	rmss/project/target/streams/compile/compile/$global/out
	rmss/project/target/streams/compile/copyResources/$global/out
	rmss/project/target/streams/compile/dependencyClasspath/$global/export
	rmss/project/target/streams/compile/exportedProducts/$global/export
	rmss/project/target/streams/compile/externalDependencyClasspath/$global/export
	rmss/project/target/streams/compile/managedClasspath/$global/export
	rmss/project/target/streams/runtime/dependencyClasspath/$global/export
	rmss/project/target/streams/runtime/exportedProducts/$global/export
	rmss/project/target/streams/runtime/externalDependencyClasspath/$global/export
	rmss/project/target/streams/runtime/fullClasspath/$global/export
	rmss/project/target/streams/runtime/internalDependencyClasspath/$global/export
	rmss/project/target/streams/runtime/managedClasspath/$global/export
	rmss/target/resolution-cache/default/rmss_2.10/1.0/resolved.xml.properties
	rmss/target/resolution-cache/default/rmss_2.10/1.0/resolved.xml.xml
	rmss/target/resolution-cache/reports/default-rmss_2.10-compile-internal.xml
	rmss/target/resolution-cache/reports/default-rmss_2.10-compile.xml
	rmss/target/resolution-cache/reports/default-rmss_2.10-docs.xml
	rmss/target/resolution-cache/reports/default-rmss_2.10-optional.xml
	rmss/target/resolution-cache/reports/default-rmss_2.10-plugin.xml
	rmss/target/resolution-cache/reports/default-rmss_2.10-pom.xml
	rmss/target/resolution-cache/reports/default-rmss_2.10-provided.xml
	rmss/target/resolution-cache/reports/default-rmss_2.10-runtime-internal.xml
	rmss/target/resolution-cache/reports/default-rmss_2.10-runtime.xml
	rmss/target/resolution-cache/reports/default-rmss_2.10-scala-tool.xml
	rmss/target/resolution-cache/reports/default-rmss_2.10-sources.xml
	rmss/target/resolution-cache/reports/default-rmss_2.10-test-internal.xml
	rmss/target/resolution-cache/reports/default-rmss_2.10-test.xml
	rmss/target/streams/$global/ivyConfiguration/$global/out
	rmss/target/streams/$global/update/$global/inputs
	rmss/target/streams/$global/update/$global/out
	rmss/target/streams/$global/update/$global/output
	rmss/target/streams/compile/externalDependencyClasspath/$global/export
	rmss/target/streams/compile/managedClasspath/$global/export
	rmss/target/streams/compile/unmanagedJars/$global/export
	rmss/target/streams/test/externalDependencyClasspath/$global/export
	rmss/target/streams/test/managedClasspath/$global/export
	rmss/target/streams/test/unmanagedClasspath/$global/export
	rmss/target/streams/test/unmanagedJars/$global/export
移除无用文件
Merge branch 'master' of https://github.com/yaomj/wasu-rmss

Conflicts:
	rmss/conf/routes