4. brødtekst
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	Documents/Rapport/SDD/proposed_architecture.tex