Fix for new confirm dialog
Merge branch 'develop' of github.com:timschofield/KwaMoja into develop
Merge pull request #145 from timschofield/develop

Develop