Merge branch 'release/initial'
Json settings implemented
Merge branch 'hotfix/json_settings' into develop