Merge branch 'master' of https://github.com/ludwiksh/Etales into raven
'megre form master'
step3
step3 finish
step4
retailer
retailer step1
retailer start
retailer step 1 finish
retailer step2 finish
retailer step3 finish
merge
fix add bug
update
producer server side update
server side code