initial commit
GroovyServlet
minus lib
+JavaServlet +ScalaServlet
editing pom.xml
Merge branch 'master' of github.com:shabunc/scala-servlet

Conflicts:
	.gitignore
	pom.xml
	src/main/webapp/WEB-INF/web.xml