upgrade ds to 2.2
update permissions
update text feature
feed importers
Merge branch 'dev' into feature/staff-profiles

Conflicts:
	modules/features/uft_users/uft_users.features.user_permission.inc
	modules/features/uft_users/uft_users.info