change gemfile
Merge branch 'dev' of github.com:souche/cheniu_auction into dev
misc
Merge branch 'dev' of github.com:souche/cheniu_auction into dev

Conflicts:
	app/controllers/dashboard/base_controller.rb
car list
msic
add pub sub