Add a word on URL-encoding CSRF tokens when needed
Merge pull request #307 from tibotiber/patch-1

Add a word on URL-encoding CSRF tokens when needed
Fix link to waterline
Merge pull request #309 from megawac/waterline

Fix link to waterline
missing descriptions
Merge pull request #315 from AlmaasAre/patch-2

missing descriptions
Updated my URL/attribution link
Added upload to custom folder
Update req.wantsJSON.md
Adding missing links
Update Policies.md

the link for the example for Passport.JS implementation was dead.  I added a new one.  Perhaps a reference for sails-generate-auth via NPM would be useful as well.
Merge pull request #318 from Harry-Torry/patch-1

Updated my URL/attribution link
Merge pull request #319 from pranavrajs/master

Added documentation for 'upload to custom folder'
Merge pull request #320 from timestep/patch-6

Adding missing links
Merge pull request #322 from robparkhill/patch-1

Update Policies.md
Merge remote-tracking branch 'origin/master' into zh-TW