Merging Master into Buildings.

Added new building icons.