Merge pull request #2182 from resurtm/CWebApplication-controllerMap-typo

CWebApplication::$controllerMap property: PHPDoc typo.
[ci skip]
Vendors: phlymail's Net_IDNA was replaced by PEAR Net_IDNA2.
UPGRADE refinement.
Merge pull request #2178 from ArnauAregall/aaregall-catalan-translation

Catalan Translation
Merge pull request #2183 from resurtm/Net_IDNA2

Vendors: phlymail's Net_IDNA was replaced by PEAR Net_IDNA2.
Upgraded HTMLPurifier to v4.5.0
TABS Ident fix.
Doc typo fix.
Some validators used to cause warnings or errors in case non-scalar array typed values being checked.
Indentation consistency fixes.
punycode.js updated from 1.1.1 (June 27, 2012) to 1.2.0 (October 10, 2012).
Changelog line.
Merge pull request #2187 from resurtm/punycode-js

punycode.js updated from 1.1.1 (June 27, 2012) to 1.2.0 (October 10, 2012).
Merge pull request #2185 from resurtm/doc-typo

Doc typo fix.
Merge pull request #2172 from klimov-paul/1724-Allow-script-html-options

Issue #1724: allow script html options.
CHtml::activeInputField() and CHtml::activeTextField() is not intended to display array values.
Update yii.php

bug in translating
Merge pull request #2189 from NabiKAZ/master

bug in translating fa_ir
Error messages related to array value case changed.
Merge pull request #2186 from resurtm/fixes-1955

Fixes #1955: Some validators used to cause warnings or errors in case non-scalar array typed values being checked.