Merge branch 'hotfix/customconfig' into develop
shell from windows update
Merge branch 'develop' of github.com:cloud66/help