Merge branch 'master', remote-tracking branch 'upstream/master'
translate db.rst
translate db.rst
translate db.rst
Updated cache.rst
Improvement of reserve example in queueing

Since both 'peek' and 'reserve' commands return job data, it seems to be more logical and efficient to only use reserve.
See https://github.com/kr/beanstalkd/blob/master/doc/protocol.txt#L238
Update volt.rst

volt extension translation
Merge pull request #429 from iGusev/patch-4

Update volt.rst
Small explanation with two php blocks break

The two php blocks were too close together, as can be seen in the http://docs.phalconphp.com/en/latest/reference/validation.html documentation page. Note that this is not visible in github's Preview. With the added explanation, they are also separated, so double benefit from a simple edit.
Merge pull request #430 from FranciscoP/patch-1

Small explanation with two php blocks break
Initially completed the translation
perfect the translation
Merge pull request #431 from Barbery/master

complete the translation of the db.rst from en to zh
update traslation of di.rst
Merge branch 'master', remote-tracking branch 'upstream/master'
update translation
update translation
odm: sort parameter becomes order in the example
Update web_root to public

web_root is confusing and may lead people to think they should use the project base directory. Since the built-in PHP web server doesn't recognize htaccess files, it needs to use the /public directory instead.
Merge pull request #435 from apfritts/patch-1

Update web_root to public