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

Conflicts:
	NetbeansTest/src/GUI.form
	NetbeansTest/src/GUI.java
hei

hei