Merge branch 'lokal-V1'

Conflicts:
	npm-debug.log
Merge branch 'master' of https://github.com/Gbeschbacher/lokalfinder