some changes, fixed missing resourceData table in db
Merge remote-tracking branch 'origin/work' into work

Conflicts:
	src/ch/jmanagr/ui/users/UserDetailController.java
	src/ch/jmanagr/ui/users/UsersController.java