Added ok button for error popup
Merge branch 'master' of github.com:markusberget/jeju