New icons and POI

amenity=fuel
Merge branch 'master' of https://github.com/dotevo/osm24

Conflicts:
	js/main.js
	static.php