ok
Merge branch 'griotte' of github.com:Hemisphere-Project/HController into griotte