clean up code
Merge branch 'cmsmarket'
add custombasissystem and multistepcmsswap to marketmodels
add new files
add a todo in a comment
extend the example
fix exercise time handling