Important parentheses
Merge branch 'master' of https://github.com/balderdashy/sails into sailor

* 'master' of https://github.com/balderdashy/sails:
  Important parentheses
Merge branch 'sailor' of https://github.com/sailorjs/sails into sailor

* 'sailor' of https://github.com/sailorjs/sails:
  Added sailor branch
Move CSRF route binding into initialize function
This way it takes place *after* the views hook does its bindings, including adding res.view
closes #1983
Merge branch 'master' of github.com:balderdashy/sails
Add req.headers.origin for all x-domain socket requests
Don't add req.headers.origin to socket requests in CORS hook
This is now being handled in a more global manner in the sockets hook
Also ignore /csrfToken requests in CORS hook when CSRF hook is enabled
Fixed CORS+CSRF tests
Remove reference to req.csrfToken in CORS hook
Merge branch 'master' of https://github.com/balderdashy/sails into sailor

* 'master' of https://github.com/balderdashy/sails:
  Remove reference to req.csrfToken in CORS hook
  Fixed CORS+CSRF tests
  Don't add req.headers.origin to socket requests in CORS hook This is now being handled in a more global manner in the sockets hook Also ignore /csrfToken requests in CORS hook when CSRF hook is enabled
  Add req.headers.origin for all x-domain socket requests
  Move CSRF route binding into initialize function This way it takes place *after* the views hook does its bindings, including adding res.view closes #1983
updated plugin system