Beer-commit
Endret Kong Harald
(cherry picked from commit 5c70cd91daef516d53b3adcf6c9b56eb9ae58471)

Conflicts:
	kongharald.txt