Conflicts:
	bwreg-jpa/src/main/java/edu/kit/scc/webreg/dao/ServiceDao.java
	bwreg-jpa/src/main/java/edu/kit/scc/webreg/entity/ServiceEntity.java
	bwreg-service/src/main/java/edu/kit/scc/webreg/service/ServiceService.java
	bwreg-service/src/main/java/edu/kit/scc/webreg/session/SessionManager.java
	bwreg-webapp/src/main/java/edu/kit/scc/webreg/bean/admin/service/EditServiceBean.java
	bwreg-webapp/src/main/java/edu/kit/scc/webreg/bean/admin/service/ServiceAdminUserDetailBean.java