Bug #1681, Feature #1682
Merge branch 'master' of github.com:jasonknight/salor-retail

Conflicts:
	salor-retail/app/controllers/application_controller.rb