Merge branch 'master' into develop
add the refactor changes from master
Merge branch 'develop' of github.com:kevinroberts/bandbot into develop