Merge pull request #146 from fahadhatib/develop

Use the new design for confirm dialog boxes
Add in flag for restricting locations
Merge branch 'develop' of https://github.com/KwaMoja/KwaMoja into develop
Fix typo in function name
Add in confirmation for deletion
Merge pull request #147 from timschofield/develop

Develop