Merge branch 'fix_default_admin_permissions' into 2-1-stable

* fix_default_admin_permissions:
  Fix default admin permissions for Spree 2.1.
Merge branch 'admin_enhancements' into 2-1-stable

* admin_enhancements:
  Remove method from form tag for create.
Merge branch 'leverage_spree_user' into 2-1-stable

* leverage_spree_user:
  Use the configured spree user class.
Merge remote-tracking branch 'upstream/2-1-stable' into 2-1-stable

* upstream/2-1-stable:
  Update spec.
Switch to using a deface template.
Add ability to manage permissions.
Enable roles to be added from the list page.
Add the pagination back in.
Add pagination for permissions.
Add specs for permissions admin.
Merge pull request #8 from delynn/add_permissions_admin

Add permissions admin