Merge branch 'master' of https://github.com/TeamTobb/Dagsverket_v2

Conflicts:
Dagsverket_v2/src/backend/Case.java
qwe

qwe