Merge branch 'master' into 'admin'

# Conflicts:
#   Gemfile
#   Gemfile.lock
#   config/application.rb
#   config/locales/en.yml
#   config/locales/vn.yml
#   config/routes.rb