merging on server
Merge branch 'master' of https://github.com/Gbeschbacher/lokalfinder
updating server