Merge tag 'release-1-work' into develop

aldfkjsadlk
Merge in shared updates
add from feature-5-work
Merge pull request #4 from seanmcmills/feature/feature-5-work

add from feature-5-work
Merge pull request #5 from seanmcmills/release/release-7-from-work

Release/release 7 from work