Fixed map controls
bootstrap changes
search bar and buttons
Merge remote-tracking branch 'origin' into categories
wireframes version 2
Merge remote-tracking branch 'origin' into categories
added categories to events