Implementet hashMap with city names, updated JUnit tests, refactored GuiMethods

City names: Fixed problems with Sweden, updated textfields and possible
edges
Merge conflict fixed