action api stuff
Merge branch 'master' of github.com:jasonknight/salor-retail
Plugin beginning
migrating troubles
Working on migrations
Merge branch 'master' of github.com:jasonknight/salor-retail

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