Merge branch 'release/2.1' into dev
smaller versions of new logo
Add highlighted events field to event content type. Display highlighted
events as Upcoming Events in sidebar.
sprint 65
Merge branch 'release/spring-65'

Conflicts:
	sites/all/modules/features/uft_blocks/uft_blocks.info