tidying things up
Merge branch 'master' into mauraUI
fixed the error dialog
error dialog resizes now