first
Java 7
servlet upd
Merge branch 'master' of heroku.com:agile-refuge-5003

Conflicts:
	sbt
	src/main/scala/JettyLauncher.scala
	src/main/scala/com/leskiv/taras/MyScalatraServlet.scala