Merge remote-tracking branch 'origin/citrus' into feature/server_connection
Adds new server address
Merge branch 'feature/server_connection' into citrus