Added markers to shapes.

Also various smaller fixes
Started with StateMachine example
Minor improvements
Merge branch 'master' of https://github.com/cwi-swat/rascal.git