preset issues - supermarket, public building

[jphilipz]

1. would like to suggest the addition of the building drop down in the supermarket preset, because if the supermarket is drawn as a way, it will not be rendered as a building without a building entry.
2. public buildings seem to be incorrectly presetted as stated in the wiki. < ​http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dpublic_building >