* master: (153 commits)
rest doc.
CS fix
Add size attribute to Modal
major features and documentation finished for REST API.
rest WIP
Removed U+FEFF character from pt-PT language file to fixe #2631
Revert "Used ternary operator instead of "or" for constant definition"
`User` here
REST wip.
Changelog
reset access cache when user identity is set
Keyboard shortcut for previous, next and refresh buttons
reset batch query result when rewinding.
fixed loading namespaceless controller classes.
Fixes#1467: Added support for organizing controllers in subdirectories
replace pjax with external resouce via composer
fixed > 100 typos introduced by me :-)
fixed condition for HHVM test
fixed phpdoc
updated phpdoc references of BaseAR to the interface
...
Conflicts:
extensions/apidoc/templates/BaseRenderer.php
extensions/apidoc/templates/html/views/constSummary.php
extensions/apidoc/templates/html/views/propertyDetails.php
* 'master' of github.com:yiisoft/yii2: (40 commits)
Fixes#2624: Html::textArea() should respect "name" option.
Removed unused "use" statements
Changed "and" to "&&"
Used ternary operator instead of "or" for constant definition
Removed unused variables
Removed executable flag from asset files
Changelog for #2607
Added note about overriding asset bundles according to #2556
Added some documentation to new pjax attribute
Add unit tests
typo fix.
Update MessageController.php
Update MessageController.php
add findAndModify() method to the Collection class
Add an option to ignore pjax request on some links.
fix code style php5.4 syntax
Inline control structures are not allowed
fix code style
fix code style
fix typo double `;`, `Each PHP statement must be on a line by itself`
...