Adding a test dialog, and id labels
Merge branch 'master' of https://github.com/tehwallz/sosafe