jobber i gui
Merge branch 'Beta' of https://github.com/henrikfischer/Programmutvikling-hovedprosjekt into Beta

Conflicts:
	NorskReseptRegister/src/norskreseptregister/gui/GuiBeta.java
yolo