Merge branch 'Dev' of https://github.com/TeamTobb/Dagsverket into Dev

Conflicts:
	Dagsverket/src/dagsverket.form
	Dagsverket/src/dagsverket.java
Fiksa