fix #9000 - add `entrance` to presets + deprecate `building=entrance` in favor of it. Icons and map style already ok.

git-svn-id: http://josm.openstreetmap.de/svn/trunk@6176 0c6e7542-c601-0410-84e7-c038aed88b3b
see #9000 - wrong copy/paste

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