Merge branch 'janiMergeMaster'
Merge branch 'master' of https://github.com/Dyrnwyn-SEM-GU/Stalker-repository.git
sorting out the main branch
Updated database connections in DatabaConnections.java to match our
database to fetch citynames, Removed merge comments that created errors
(like <<<<<HEAD), Removed calls to classes that have been renamed in
Main.java and removed merge comments from TestUiFrame.java.

GUI and TestUiFrame.java contain code with errors. I assume that
something needs to be added to Main.java.
something in Main
Finished database java + SQL commands for inserting data.
Need to connect textfield and dropdown menu variables to database
queries. database java + sql for selecting City for to, from and car
registry numbers should now be ok.