Neuer Table in Administration
Merge branch 'master' of https://github.com/timosl/interwerk.git

Conflicts:
	src/main/webapp/admin.jsp
Merge-Fix