rename pkg
Merge branch 'master' of github.com:3amice/EDAN70

Conflicts:
	src/main/scala/web.scala