added in events listing for building detail view controller
fixed merge conflicts?
fixed some issues with layout
Merge branch 'master' of github.com:CarlTour/CarlTour