Merge branch 'master' of https://github.com/yiisoft/yii.git
CHttpRequest::stripSlashes() changed to modify array keys as well
using tabs for indentation
fix: empty array were not handled
added Changelog
minor change in changelog entry
Update framework/db/ar/CActiveRecord.php

Если в ActiveRecord переопределить метод getTableAlias, то будут возникать ошибки неизвестной таблицы t, а так он будет использовать текущий алиас у таблицы
cleanup comments in `@property` annotation script
speedup phpunit tests on travis

fixes #1890
Merge pull request #1978 branch '1977-CFormatter-normalizeDateValue-protected' of https://github.com/etienneq/yii into etienneq-1977-CFormatter-normalizeDateValue-protected

* '1977-CFormatter-normalizeDateValue-protected' of https://github.com/etienneq/yii:
  minor change in changelog entry
  changelog
  #1977: declared CFormatter::normalizeDateValue() as protected

Conflicts:
	CHANGELOG
updated docs of CFormatter class
Created a LocalizedFormatter class

issue #1818
documentation and changelog for localized formatter
fixed spaces -> tabs
Update framework/db/ar/CActiveRecord.php

method save() always returns true, even if the record does not exist in the database
Issue #1966 - CWsdlGenerator now supports soap indicators (sequence, choice), injecting of custom WSDL string block and generation of human-friendly documentation for complex types. Added unit test.
Removed @property declaration
Added more docs about second param.
Fixed docs
Merge pull request #2066 from Ragazzo/CComponent-attachBehavior-method-fix

Added more docs about second param for CComponent::attachBehavior()