update P2 map paint style: support of `amenity=library`, `amenity=nightclub`, `emergency=fire_hydrant`, `shop=department_store`

git-svn-id: http://josm.openstreetmap.de/svn/trunk@6351 0c6e7542-c601-0410-84e7-c038aed88b3b
Merge branch 'master' into mirror