Merging testingBranch with master

We have finished development on SAUVER.