Fix styling and resource strings
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	WhipAroundRegistry/templates/oma.html