Issue with interface implementation
Merge branch 'origin/master'

Conflicts:
	workspace/enwida/src/main/java/de/enwida/web/service/implementation/NavigationServiceImpl.java