Merge branch 'master' of https://github.com/ludwiksh/Etales into raven
update
decision data fix (2)
update
contract
fix progress bar