transition states changed to virtual methods
Merge branch 'development' of ssh://github.com/jorisvergeer/HUniversal-Production-Utrecht into development