Event test
Merge branch 'master' of https://github.com/SimonHolst/Prohjet_Software

Conflicts:
	test/projektplanner/app/SampleDataSetup.java
Merge branch 'master' of https://github.com/SimonHolst/Prohjet_Software

Conflicts:
	test/projektplanner/app/SampleDataSetup.java