Made the ErrorDialog OP.
Merge branch 'master' of git@github.com:rtheunissen/KPSmart-Team-4.git