Merge branch 'release/spring-65' into dev
Updates to Coming Events block display.
Update PDF timetable link.
Merge branch 'hotfix/features-20141008' into dev

Conflicts:
	sites/all/modules/features/uft_units/uft_units.views_default.inc
Add JSON export for all events.
Update events.json display.
Add JSON export for Courses.
Add JSON export for News Archive (not very useful).
Add JSON export for Information.
News Archive JSON export: display all.
Add JSON export for Staff.
Merge branch 'feature/json-export' into dev
Release 2.2-a: JSON exporters for events, courses, news, information and staff
Merge branch 'release/2.2-a'