Merge branch 'develop'
Merge branch 'feature-39' into develop
Merge branch 'develop'
Implementing feature #39, deploying openshitf
Merge branch 'master' into feature-39