Merge branch 'release/7.x-0.2'
Merge branch 'release/7.x-0.2'
Merge branch 'hotfix/contrib-updates' into dev
Merge branch 'feature/import-units' into dev
updating timetables, and course-unit relationships
basic uft_2013 theme created with omega_tools
sans-serif
update dependencies
uft_text feature without plain text filter
uft_text flush and revert
Merge branch 'hotfix/testing-migrate'
Merge branch 'hotfix/testing-migrate' into dev

Remove plain_text format

Conflicts:
	modules/features/uft_text/uft_text.features.filter.inc
	modules/features/uft_text/uft_text.info
update text formats, add buttons
Merge branch 'dev' into feature/timetable-views
update course and unit views and displays
Export timetable view
update timetable filters
dependencies for timetable views
Update unit and timetable import using Open Refine, Feeds Tamper, and Rules.
temporary favicon and logo from 2012