Merge branch 'master' into develop
Finished demo project
Merge branch 'release/Demo_release'