Merge branch 'citrus' into feature/server_connection
Resolves a bad login bug
Merge remote-tracking branch 'origin/citrus' into feature/server_connection
Merge branch 'feature/server_connection' into citrus