chart navigation test fix and other small fixes
chart navigation test fix and other small fixes
changes user table to users
Merge branch 'origin/master'

Conflicts:
	workspace/enwida/src/main/java/de/enwida/web/controller/UserController.java
	workspace/enwida/src/main/java/de/enwida/web/service/interfaces/INavigationService.java
	workspace/enwida/src/main/resources/db.user.sql
	workspace/enwida/src/test/java/de/enwida/web/ChartNavigationTest.java
resolve merge errors