Merge pull request #1 from yiisoft/master

Merge from yiisoft
Merge pull request #2 from yiisoft/master

Merge from master
Merge pull request #3 from yiisoft/master

Merge from yiisoft/yii
Removed unnecessary else
Merge http://github.com/yiisoft/yii2

* http://github.com/yiisoft/yii2:
  Fixes issue #134
  Rollback word consistencty over entire codebase (ref. #139).
  Add ensureBehaviors() to detachBehavior*()
Merge http://github.com/yiisoft/yii2

* http://github.com/yiisoft/yii2: (23 commits)
  move JsExpression to web.
  Fixes issue #155.
  Fixes the variable name
  Added twig, smarty and php-markdown dependencies, vendor is gitignored now
  added composer.json
  fix
  fix
  Wrapped code with github-style blocks with PHP highlighting
  Fixed typo
  Controllers section example fix
  Renamed YiiBase to \yii\YiiBase.
  Added namespace section.
  Added dirty attribute description.
  Fixed doc about renderers.
  Finished the initial draft of upgrading instructions
  Fix attaching behavior via config
  Changed default value of View::renderers.
  Fix attaching behavior via config
  Menu WIP
  upgrading instructions WIP
  ...
Fixed merge
Modal::clientOptions disable support.
Used intl ICU for message translation
Merge branch 'master'
More i18n tests, docs, added check to skip fixes where possible
Renamed test to match class name
better wording
typo
Minor additions to i18n docs
a parser that is able to deal with the right number of args
intl message parser now handles too many or too less args
fixed regex for multiline patterns
improved unit tests for ICU message formatter
adjusted I18N to be consistent with intl message formatting