Merge branch 'BuildingsController--view'
Merge branch 'master' into BuildingsController--view