Add building type to collection view cells.
Merge remote-tracking branch 'origin/master'