Merge branch 'hotfix/menu'
Merge branch 'release/sprint-35'
Merge branch 'release/deploy-20131205'
ckeditor 4.3.1 standard
Wysyiwyg creditor patch from https://drupal.org/node/1853550#comment-7140358
CKEditor 4.3.1 full
Recreated blocks and contexts
Update feed importer settings for mail chimp (still not working?)
Update units and timetable.

MCD University of Divinity -> University of Divinity.

Timetable PDF location.
Add Mollom.

[Fixes #58939648]
Recreate Text feature to match production site.
Recreate Units feature to match production site.
Recreate Blocks feature to match production site.
Recreate Events feature to match production site.
Recreate News Archive feature to match production site.
Add RSS feed to News Archive.

[Finishes #66826572]
Merge branch 'release/2.1'
update pdf link in timetable view
Merge branch 'release/spring-65'

Conflicts:
	sites/all/modules/features/uft_blocks/uft_blocks.info
Update uft_units:
- Update PDF timetable link
- Change latest year offered to 2014