Merge branch 'dry_request_macros' of github.com:phiggins/refinerycms …

…into dry_request_macros

Conflicts:
	authentication/spec/requests/refinery/admin/users_spec.rb