updates
Merge branch 'master' of github.com:sundaysenergy/client-dev-demo