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

Conflicts:
	NetbeansTest/src/GUI.form
	NetbeansTest/src/GUI.java
qweqsad
qwe
Revert "hei"

Conflicts:
	NetbeansTest/src/GUI.form
	NetbeansTest/src/GUI.java
Revert bd4f5e8..730e7d9

This rolls back to commit bd4f5e80bca63cb228b093ac6bfe7668514da4e7.
Merge branch 'master' into Jorg
pritn

test