configuration.php giti alt ära
Merge branch 'master' of https://github.com/olavk/romu

Conflicts:
	configuration.php