Merge branch 'feature/190-add-previous-year-to-navbar' into develop
Merge branch 'feature/196-add-more-partners' into develop
Fix events page.
Timetable modals added & long-title events hover solution.
Merge branch 'feature/36-timetable-modals' into staging

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