Merge branch 'hotfix/0.9.7'
Merge branch 'master' of https://github.com/texttochange/vusion-frontend into develop
added an if condition to test the settings
refactor
refactor 2
Merge branch 'hotfix/0.9.8' into develop