Sprint 2, finpuss gjenstår
Merge branch 'ds2'

Conflicts:
	WorkHours/src/com/example/workhours/fragments/ConfirmDialog.java