Merge branch 'master' of https://github.com/yiisoft/yii
Fixed conflict with text/xml header.
Changed signature of CWsdlGenerator::buildHtmlDocs($return=false) to callable from other script. Also needed for unit test.
Merge branch 'master' of https://github.com/lubosdz/yii