Mini-backoffice idents
Merge branch 'backoffice-ng' into mini-backoffice

Conflicts:
	src/Carma/Model/ActionResult.hs
Merge branch 'mini-backoffice' into mini

Conflicts:
        src/Carma/Model/ActionResult.hs

(No existing idents dropped!)