merged
Refactored VacationEvent to Event with EventType
Merge branch 'master' of https://github.com/hhagmans/Ticket-Boys.git

Conflicts:
	src/main/java/de/fh_dortmund/ticket_system/business/ConflictFinder.java
	src/main/java/de/fh_dortmund/ticket_system/business/PersonalVacationEventModel.java
	src/main/java/de/fh_dortmund/ticket_system/entity/Shift.java
	src/main/java/de/fh_dortmund/ticket_system/presentation/PersonalVacationView.java
	src/main/java/de/fh_dortmund/ticket_system/presentation/TeamVacationView.java
	src/main/java/de/fh_dortmund/ticket_system/util/TestdataProvider.java
	src/test/java/de/fh_dortmund/ticket_system/business/ConfliktTest.java
	src/test/java/de/fh_dortmund/ticket_system/util/DateUtilTest.java
Merge branch 'master' of https://github.com/hhagmans/Ticket-Boys.git

Conflicts:
	src/main/java/de/fh_dortmund/ticket_system/business/PersonalVacationEventModel.java
	src/main/java/de/fh_dortmund/ticket_system/entity/VacationEvent.java