Cleanup all files from 1.0-SNAPSHOT as some case sensitive changes have created conflicts with MacOS that is not case sensitive.
Merge branch 'master' into develop
Add back the 1.0-SNAPSHOT files following cleanup due to case issues.