do not import or recreate users
Revert "do not import or recreate users"

This reverts commit d06e6315181610614080bce55d783a2d35e708f0.
remove timetable feed importer
unit feed importer: remove disciplines, add departments
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 permissions
try staff feeds import again
auto node title settings for staff import
entityreference patch from http://drupal.org/node/1459540#comment-6810146
update permissions
staff profile auto node title: use raw tokens to fix apostrophes
staff importer is broken
clean up staff importers
clean up feed importers, add college field again
uft_staff: feeds importer seems to have trouble with list (integer) fields
Merge branch 'feature/staff-profiles' of github.com:claudinec/uft_profile into feature/staff-profiles

Conflicts:
	modules/features/uft_staff/uft_staff.features.field.inc
	modules/features/uft_staff/uft_staff.feeds_importer_default.inc
	modules/features/uft_users/uft_users.features.user_permission.inc
	modules/features/uft_users/uft_users.info