Merge branch 'release-1.4' into develop
Merge branch 'master' into feature5
Merge branch 'master' into feature5
Removes Demo changes
Merge branch 'develop' of https://github.com/davidkethel/try_git
Merge branch 'feature5' of https://github.com/davidkethel/try_git