dt
Merge branch 'cleanup' of github.com:jasonknight/salor-retail into cleanup

Conflicts:
	salor-retail/app/controllers/vendors_controller.rb
	salor-retail/app/views/vendors/new_drawer_transaction.js.erb