updated to work fine with sails 0.10.3
Merge branch 'release/update-to-sails-0.10.3'
Merge tag 'update-to-sails-0.10.3' into develop

updated to work fine with release 0.10.3 of SailsJS
Merge branch 'develop' of http://github.com/masallahaydragones/sailsjs-boilerplate into develop