Ticket fixed.
More fix
Merge remote-tracking branch 'remotes/origin/devbranch_persist23' into dev_branch_persist

Conflicts:
	Frontend/src/main/java/com/web/bokningstjanst/BServlet.java