Merge branch 'hotfix/link-modules'
Cleaning up in order to sync staging and dev.
Merge branch 'hotfix/remove-feeds'
Merge branch 'hotfix/remove-feeds' into dev

Conflicts:
	modules/features/uft_courses/uft_courses.info
	modules/features/uft_staff/uft_staff.features.field.inc
	modules/features/uft_staff/uft_staff.features.inc
	modules/features/uft_staff/uft_staff.feeds_importer_default.inc
	modules/features/uft_staff/uft_staff.info
	modules/features/uft_text/uft_text.features.filter.inc
	modules/features/uft_units/uft_units.features.field.inc
	modules/features/uft_units/uft_units.feeds_importer_default.inc
	modules/features/uft_units/uft_units.feeds_tamper_default.inc
	modules/features/uft_units/uft_units.info
	modules/features/uft_users/uft_users.info
do not import or recreate users
Revert "do not import or recreate users"

This reverts commit d06e6315181610614080bce55d783a2d35e708f0.
Department as taxonomy
remove timetable feed importer
unit feed importer: remove disciplines, add departments
update staff importer
do not import or recreate users
Revert "do not import or recreate users"

This reverts commit d06e6315181610614080bce55d783a2d35e708f0.
Update uft_profile.make

Update Token version.

Remove Backup and Migrate version.
Update uft_profile.make
Update uft_profile.make

Update libraries: CKEditor and Profiler.

Download Adaptive Theme instead of Omega.
backup_migrate is being difficult
remove uft_2012 theme
require wysiwyg
update permissions
require diff