Added Pjax::timeout and clientOptions.
Merge branch 'master' of git://github.com/yiisoft/yii2
Fixes #2212: `yii\gridview\DataColumn` generates incorrect labels when used with nosql DB and there is no data
Fixes #1856: The default CSS class for hint generated by `ActiveField` is changed to `help-block`
fixed yii cmd with aliases.
Revert "Fixes #1856: The default CSS class for hint generated by `ActiveField` is changed to `help-block`"

This reverts commit 7ae4695d0cf46f3347ff8f340f572a08419f21a7.
doc fix.
Fixes #2139: error found while sending response is not displayed.
Fixes #2160: SphinxQL does not support OFFSET
Improved `QueryBuilder::buildLimit()` to support big numbers
doc note about forms in pjax, fixes #2214
Update security.md

Documentation edits
Update security.md
fixed an issue with code highlighting
removed newline from php highlighting
improvements to php codehighlight
Merge pull request #2218 from arisk/patch-4

Update security.md
Fix URL Bootstrap
Merge pull request #2219 from marsuboss/fix-url-bootstrap

Fix URL Bootstrap
docs: copy guide images

issue #1797
markdown typo in advanced app guide