Fixed server startup and independent test case execution.
Fixed server startup and independent test case execution.
Merge branch 'origin/master'

Conflicts:
	workspace/enwida/src/main/java/de/enwida/web/service/implementation/NavigationServiceImpl.java
	workspace/enwida/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml
Updated merge commits