* 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.
...
* master: (117 commits)
More Model tests
Better validation rules validity check
Some tests for Model
A bit more friendly behavior for unsetting a model attribute
User WIP.
Fixed Model::getFirstErrors()
Finished AccessControl.
Finished HttpCache.
User WIP
line ending fix.
refactoring cache and db references.
Fixed session bug.
Finishes flash feature.
refactored url creation shortcut method.
HttpCache WIP.
Finished AccessControl and HttpCache.
Finished PageCache.
finished fragment caching.
fragment cache WIP
bug fixes.
...