Merge branch 'hotfix/hotfixes' into develop
Merge branch 'hotfix/content_tweaks' into develop
added location and picture columns to Event model
made a Event method to get the sanitized description html
save event location in CalendarService
change sanitized Event params
Merge branch 'hotfix/beer_menu' into develop
allow target tag in sanitized event html
added location to public and admin events views
moved event updating controller logic to the event action
added a little spacing to the event info left column
Merge branch 'feature/events' into develop
Merge branch 'develop'