* 'master' of git.yiisoft.com:yii2:
Smarty: added path function and exposed $app and $this
Twig: added path() function, exposed app and this in templates
* master: (27 commits)
form wip
form wip
form WIP
script WIP
Minor change about twig alias.
Added Controller::populate().
Added bootstrap. form WIP
form wip
form wip
Refactored UrlManager.
refactored AccessControl
activeform WIP
Removed the $value parameter from radio and checkbox.
Support alternative URL rule syntax.
Support default standard component class.
updated view renderers docs
activeform wip
Refactored view renderers.
updated view renderers docs
refactoring activeform.
...
* origin/master: (104 commits)
Fixed typo in query builder and reverted changes to DbCache.php
added note about enabling APC cache for CLI
more assertions for cache test
fixed dbcache multiget
fixed Html test under Windows (line endings)
fixed DB quoting typo
create a webapp in test bootstrap
updated expected exception message
Added a basic app.
initial implementation of asset command.
script WIP
script command WIP
Fixed bug in yiic.php. Refactoring AssetConverter.
adjusted default app layout
refactoring and documentation for asset/script management.
Finished asset converter.
removed unnecessary code, added comment about displaying errors
better handling of errors during rendering an error
safer exception rendering
turn asset manager into a getter.
...