加入消息队列
Merge branch 'dev' of github.com:souche/cheniu_auction into dev

Conflicts:
	Gemfile
修改字段
add capistrano-sidekiq