Merge with conflicts!

Conflicts:
	src/main/java/de/metalcon/middleware/controller/entity/EntityController.java
	src/main/java/de/metalcon/middleware/view/entity/EntityView.java
	src/main/webapp/WEB-INF/views/_site.ftl