Merge remote-tracking branch 'origin/jassob'

Conflicts:
	Bokningssystem/FormBoka.Designer.cs
Merge branch 'master' of https://github.com/NilsBerholt/Bokningssystem

Conflicts:
	Bokningssystem/FormBoka.Designer.cs