Merge branch 'master' of git://github.com/yiisoft/yii.git into 2289-CDbCacheDependency-reuseDependentData-fix
Merge branch 'master' of git://github.com/yiisoft/yii.git
Remove extra spaces
Added "bin" key to composer.json. (#2314 merged manually.)
docs/guide/ja/basics.component.txt updated
Merge pull request #2319 from softark/docs-ja

docs/guide/ja/basics.component.txt updated
Fixes #2254:

1. Fixes original issue: AJAX and client validation doesn't work with `errorSummary` set to true.
2. Added `CForm::$showErrors` which controls whether error elements of the each attribute should be rendered.
PHPDoc fixes:

1. Additional `CForm` class note.
2. Better description of the `CForm::$showErrors`.
Merge pull request #2318 from klimov-paul/stat-element-ambigous-composite-pk

CStatElement ambiguous fields error with join table with composite PK fixed.
Unit test "CUploadedFileTest" has been created.
Test case "CUploadedFileTest::testGetInstanceByNamePartOfOtherName()" has been added to expose issue #159.
Test case "CUploadedFileTest::testGetInstancesByNamePartOfOtherName()" has been fixed to expose issue #159.
"CUploadedFile::getInstancesByName()" has been fixed, allowing correct fetching names, which are part of other names.
Issue #159 has been added to CHANGELOG.
Fixing bug in CWebUser#renewCookie which was causing it to ignore any configuration parameters speicified in user => identityCookie
Fixing CWebUser#restoreFromCookie to respect identityCookie options as well. Adding changelog line
oops, did not notice that changelog entries are ordered by type then number
Merge pull request #2290 from marcovtwout/2289-CDbCacheDependency-reuseDependentData-fix

FIX: CDbCacheDependency with reuseDependentData did not invalidate cache when getting cache across different requests
Merge branch 'master' of git://github.com/yiisoft/yii.git
fixed typo in API code example