FS-3: App closes when you cancel while selecting a server address.
Merge branch 'master' into loginscreen

Conflicts:
	src/main/java/org/fides/client/App.java