Merge branch 'release/initial_setup' into develop
some dev work
create a release
Merge branch 'release/bring_in_feature'