rebase https://github.com/balderdashy/sails-docs/commit/682ebe6185fdcdb4d9ea259ad1afe75d3d267d9b onto 1.0
rebase https://github.com/balderdashy/sails-docs/commit/682ebe6185fdcdb4d9ea259ad1afe75d3d267d9b onto 1.0
yoshioka-s/sails-docs-ja