FIX show also pictures without name
Merge branch 'upstream/master'

Conflicts:
	osmmap2.php
add scale
Merge pull request #24 from mb1248/scale

Adding a scale to the map