update markets and info
Merge branch 'master' of https://github.com/etiennecha/master_code