generated with sails v0.10
Merged beta