Merge branch 'master' into dev
Allow editing server infos at runtime
v1.1.0
Merge branch 'dev'