Merge branch 'hotfix/1.21.1'
Merge branch 'release/1.22'
if flash[:alert]
      redirect_to :back
    end
Merge branch 'hotfix/1.22.1' into develop
div.flash.notice{
    background-color: #DFF0D8;
    border-color: #D6E9C6;
    color: #3C763D;
}
setting I18n.locale on application_controller.rb
internationalizing home/index.html.erb
moving set_locale method to store_controller_decorator.rb
gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '2-4-stable'
internationalizing home/index.html.erb
internationalizing home/index.html.erb
internationalizing home/index.html.erb
fixing bugs whit tabs on home page, and improved it
internationalizing cars/ _inputs.html.erb
internationalizing cars/ _list.html.erb
internationalizing cars/ index.html.erb
internationalizing flights/ _inputs.html.erb
internationalizing flights/ _list.html.erb
internationalizing flights/ index.html.erb
internationalizing hotels/ _inputs.html.erb