Resolve "add server selection screen"

Merged armin requested to merge 5-add-server-selection-screen into master

Closes #5 (closed)

Edited by Roland Alton

Merge request reports