Merge origin/master

Conflicts:
	src/GUI/LogInArbejder.form
Merge origin/master

Conflicts:
	src/GUI/LogInArbejder.form
Merge origin/master