Merge branch 'develop' of github.com:cgkineo/kineo-essentials-source
Merge branch 'master' of github.com:cgkineo/kineo-essentials-source