user changes
Merge branch 'master' of https://github.com/rlfriedm/HAP-APP