final merge of the work of those 2.5 days

Created by: mguijarr

Arrived in Geneva, last commit before taking the shuttle back home ;)

This commit contains changes from yesterday by Frederik and my own changes.

It is a work in progress.

At some point we should merge redux branch and master... Next PR maybe ?

See you all in Barcelona. It was great to work with you guys !