完善创建秒杀产品
增加秒杀产品列表
Merge branch 'feature/seckill' into develop

Conflicts:
	spec/apis/v1/admin/controllers/seckills_spec.rb
增加返回参数
bug fixed
bug fixed
创建,更新秒杀产品增加对json字符串的支持
Merge branch 'feature/seckill_order' into develop
修复创建秒杀产品
Merge branch 'feature/seckill_order' into develop
完善秒杀产品搜索
增加不能重复创建秒杀产品的处理
seckill mem support
Merge branch 'develop' of 192.168.1.126:gold_cat into berek
remove binding.pry
search seckill
fix bug for search order
Merge branch 'develop' of 192.168.1.126:gold_cat into berek
manage seckill order
Merge branch 'develop' of 192.168.1.126:gold_cat into develop
add rspec test