add market maker
remove .pyc files
Merge branch 'master' into develop
Update .gitignore
Update submodules