Upgrade to spray 1.0-M4.2
Upgrade to spray 1.1-M4.2
Update README
Upgrade to spray 1.1-M5
Upgrade to spray 1.1-M6
fix application_s_.conf -> application.conf
Upgrade to spray 1.1-M7
Updated sbt-revolver repository from cc.spray to io.spray
Merge pull request #17 from zoomzoom83/on_spray-can_1.1

Updated sbt-revolver group id from cc.spray to io.spray
Upgrade to spray 1.1-M8
upgrade to recent version of xsbt-web-plugin
Update README.markdown

fix a typo : Start -> Stop
Merge pull request #21 from vmunier/patch-1

Update README.markdown
upgraded template to spray 1.1-RC1 and other latest versions
Merge branch 'on_spray-can_1.1' into on_jetty_1.1

Conflicts:
	README.markdown
	build.sbt
	project/build.properties
	project/plugins.sbt
	src/main/resources/application.conf
	src/main/scala/com/example/Boot.scala
Merge branch 'on_jetty_1.1' into on_jetty_1.2

Conflicts:
	build.sbt
	project/plugins.sbt