some maintenance stuff
test fix
maintencance page
fixed test
Merge branch 'master' into monitoring