code base cleanup
Merge branch 'master' of https://github.com/CST4G/HA_User.git