Trim "origin" and "routesDisabled" in CSRF hook to trim values
Merge branch 'master' of github.com:balderdashy/sails
0.10.5
Update MODULES.md
first fork from sails; fixing some path issues; commenting out tests that do not work on Windows
fixing lift tests
updating readme
fixing www.test
fixing new.test; adding touch dev dep
adjusting expectations of sails generate test based on what actually happens in sails app
removing left in only flag
Merge remote-tracking branch 'origin/master'

Conflicts:
	test/integration/generate.test.js