changed path
added some dummy locations in weimar
merged new stuff from master into feature/map
added locations (marker) from locationstore