Fixes #2426: CDbCriteria::__wakeup() used to issue an error in case SQL containing fields were arrays and criteria parameters were specified.
Merge branch '2426-CDbCriteria-wakeup' of https://github.com/resurtm/yii into resurtm-2426-CDbCriteria-wakeup

Conflicts:
	CHANGELOG
Changes in CClientScript::registerScriptFile() and CClientScript::registerScript() and new Active Record meta data management have been added to UPGRADE.
Merge pull request #2447 from klimov-paul/upgrade-missings-for-1.1.14

Some missing upgrade instructions for 1.1.14
Typo in UPGRADE file