Fix layouting of StateViews

[Matthias Schoettle]

The layout of state views uses the StateView as a container. However, each StateMachine has its own layout, meaning that StateMachine should be the container.

This made a bug fix necessary in commit fc7a417.

Steps to perform: * change layouting to use StateMachine as the container * remove temporary fix of commit fc7a417 * (manually) fix the existing aspects to use the StateMachine as the container (key of the map)