bumps scala and scalatra version.
moves version to next dev release
Merge pull request #2 from guardian/scala-2.10-scalatra-2.0.5

Scala 2.10 scalatra 2.0.5