Merge branch 'feature/182-ipad-main-menu' into develop
add sanitize
Merge branch 'feature/remove_wysiwyg_from_events' into staging

Conflicts:
	app/views/web/events/index.html.haml
	app/views/web/schedules/_event.html.haml