Merge branch 'hotfix/new_server'
Merge branch 'release/1.0.4'
Fixed double quotes char
Merge branch 'hotfix/unicorn_fix' into develop