Merge branch 'develop', remote-tracking branch 'origin'
Merge branch 'develop' of https://github.com/timothywhite/worshiplibrary into develop