inherit Spree::Admin::BaseController
Merge remote branch 'origin/2-1-stable' into 2-1-stable