Merge branch 'master' of https://github.com/ludwiksh/Etales into raven
merge from master
update retailer
merge from master
update