Updated develop branch with clean slate sailsjs.