hard fix :)
Merge branch 'master' of github.com:Smart-Core/cmf-sandbox2