Admin sammensættelse
Merge branch 'master' of https://github.com/lassemand/hotelRitz

Conflicts:
	ritzSol/ritzSol.v11.suo