Added Conflict in ShiftCalcutor
Merge
Merge
Merge branch 'master' of https://github.com/hhagmans/Ticket-Boys.git

Conflicts:
	src/main/java/de/fh_dortmund/ticket_system/business/VacationEventModel.java
	src/main/java/de/fh_dortmund/ticket_system/entity/Employee.java
	src/main/java/de/fh_dortmund/ticket_system/persistence/EmployeeDaoSqlite.java