Finish user edit, update, index and destroy actions
Merge branch 'updating-users'

Conflicts:
	spec/requests/authentication_pages_spec.rb
	spec/support/custom_matchers.rb
	spec/support/macros.rb