Merge branch 'master' into mb_errorMessage
Error pages work, ui files need some work