Merge branch 'ajbranch'
Merge branch 'master' of https://github.com/mr-mr/GuardianUX