emil
Emil
Merge branch 'master' of github.com:emilhasteen/dittstallrepo

Conflicts:
	.classpath
emil
Merge branch 'master' of github.com:emilhasteen/dittstallrepo

Conflicts:
	WebContent/META-INF/context.xml