mgheata/scaled

The development of the scaled shapes is now ready to be merged with the master.

Since this branch was started from devel some time ago, I had to rebase on the master and fix all conflicts in favour of master - I guess this needs to be done also for the final merge...