C9 commit
Merge branch 'master' of github.com:julienfroidefond/testing-sails