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
Merge branch 'master' of github.com:yiisoft/yii2

* 'master' of github.com:yiisoft/yii2: (1471 commits)
  Remove PHP 5.3 Travis build rule. Related to #35.
  Remove use ($this). Related to 9e1b498fb513b3c51c6f943180a317ffef6f05e2.
  PHP 5.4 supports $this with closures.
  Fixes #999.
  Just simple support PostgreSQL in QueryBuilder
  debug panel : changed .json to .php
  debug panel : change json_encode/decode to serialise/unserialise to prevent non-UTF characters error
  typo fix
  Fixes #930: Added i18n docs about configuring message source
  commented private property
  Fixed typos
  fixes #995
  More on GII buttons
  Fixed option merging in Console::prompt()
  changed default button style
  typo fix.
  Refactored getModule and hasModule.
  Added intl check to tests, better error reporting, credited Aura.Intl for the most complex test pattern
  Better MessageFormatter tests
  GII sub-modules support - see #871
  ...
Convert to short syntax
Merge pull request #1008 from sensorario/master

Convert configuration to short syntax