Editing Gemfiles
Merge branch 'master' of github.com:jasonknight/salor-retail
Merge branch 'master' of github.com:jasonknight/salor-retail

Conflicts:
	salor-retail/Gemfile.development
Merge branch 'master' of github.com:jasonknight/salor-retail
Fixing migrations