generate POI markers
(cherry picked from commit 844dfde5260e82deedc4b4e64d643c9c33c92b1a)
Update update.sh
(cherry picked from commit 58f1ca3cecb0ec7092c1b0dab148a8bdd0a3d593)
Update genconfig.php
(cherry picked from commit ea27781f6d7ee1e2eada02187950a52b49d0a4fc)
Update genconfig.php
(cherry picked from commit 404d8355bb619fcc7aefaa55d3288a68a73e9a17)
Update genconfig.php
(cherry picked from commit 2a36e2ad1895d8526d8af245daa1c66619d4743c)
Update genconfig.php
(cherry picked from commit ce7584d4c975f6e2fd0c688c9df9be3309c45a47)
Update genconfig.php
(cherry picked from commit adcc2b7d16b2ea65410b9c790ccee38f3cb7c45c)
Merge remote-tracking branch 'origin/test'
Create testoverviewerconfig
Revert "Create testoverviewerconfig"

This reverts commit e5fe411012d847d8514f12cf752c1eb9fa326e14.
Merge branch 'test'

Conflicts:
	genconfig.php
Merge branch 'master' into test