fix
Merge branch 'master' of github.com:tobiasv/MyBlitzortung

Conflicts:
	includes/import.inc.php