Added a new step def that creates a user with a role in a specified unit.
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	features/step_definitions/users.rb