Develop

Hi Mike, 

this is a version that holds the changes by @RvanDalen, @RalfvandenBurg and myself.
This is version is based on your sc7 feature branch and we currently use this version on production sites.
We've merged it with your latest changes.

The changeset is becoming quite large so we really hope to merge the versions together.
The largest diffs are ofcourse your files from the sc7 feature branch

Let me know what you think!

Regards,
Chris van de Steeg