xxx
Merge branch 'rails-money' of github.com:jasonknight/salor-retail into rails-money

Conflicts:
	salor-retail/db/schema.rb
xxx
Merge branch 'rails-money' of github.com:jasonknight/salor-retail into rails-money

Conflicts:
	salor-retail/db/migrate/20130714072046_migrate_refunds2.rb