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.
fixes #995
Fixed typos
commented private property

fixes #997
Merge branch 'master' of github.com:yiisoft/yii2

* 'master' of github.com:yiisoft/yii2: (27 commits)
  Fixed typos
  fixes #995
  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
  Module::getModule and Module::hasModule support for sub-modules - see #983
  removed needFix method
  Removed intl version check since it's very inconsistent and it seems bundled versions are always the same ones for the same PHP versions
  Fixes PHP 5.5 weird placeholder replacememt in case no arguments are provided at all (https://bugs.php.net/bug.php?id=65920).
  changed plural format for BaseListView
  applied new style of Yii::t params to all occurences
  fixed I18N handling of special param values and broken message tags
  adjusted I18N to be consistent with intl message formatting
  improved unit tests for ICU message formatter
  fixed regex for multiline patterns
  intl message parser now handles too many or too less args
  ...
Merge pull request #993 from lucianobaraglia/master

More on GII buttons [skip ci]
Fixes #930: Added i18n docs about configuring message source
typo fix
debug panel : change json_encode/decode to serialise/unserialise to prevent non-UTF characters error
debug panel : changed .json to .php
Just simple support PostgreSQL in QueryBuilder
Merge pull request #1006 from chelishchev/basic-support-pgsql-in-query-builder

Support PostgreSQL in QueryBuilder
Merge pull request #808 from callmez/master

Modal::clientOptions disable support.