more re-doing git work
Merge branch 'master' of github.com:cloud66/help into develop