Update features
Merge branch 'lou-experiment' of https://github.com/SixSq/sixsq.github.com into lou-experiment