update
update
merge from master
Merge branch 'master' of https://github.com/ludwiksh/Etales into ravena
merge from master
market report
merge