Upgrade to Scalatra 2.1.0-SNAPSHOT and its new dependencies.
Merge branch 'master' into develop

Conflicts:
	src/main/g8/build.sbt
Merge branch 'master' into origin/develop
Released 2.0.4.
Use ScalatraListener to bootstrap the app.
Upgrade to Jetty 8.1.0.
Upgrade to Jetty 7.6.0.
Merge branch 'master' into develop

Conflicts:
	src/main/g8/build.sbt
Revert "Use ScalatraListener to bootstrap the app."  Should be on develop.

This reverts commit cfa1f0d2d026f64857524187b32d41e77b3610bf.
Merge branch 'master' into develop
Use ScalatraListener to bootstrap the app.
Farewell, cross builds.
Updated dependencies to sbt 0.11.3 and related xsbt-web-plugin 0.2.11.1
Merge pull request #6 from utaal/sbt-0.11.3

Updated dependencies to sbt 0.11.3 and related xsbt-web-plugin 0.2.11.1
Updated dependencies to sbt 0.11.3 and related xsbt-web-plugin 0.2.11.1.
Merge pull request #7 from utaal/develop-sbt-0.11.3

Updated dependencies to sbt 0.11.3 and related xsbt-web-plugin 0.2.11.1.
fix README.md broken link
Merge pull request #8 from xuwei-k/patch-1

fix README.md broken link
Update jetty version
update jetty version, correct configurations for servlet api