* 'master' of github.com:yiisoft/yii2: (1471 commits)
  Remove PHP 5.3 Travis build rule. Related to #35.
  Remove use ($this). Related to 9e1b498f.
  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
  ...

Debug panel : change json_encode/decode to serialise/unserialise

Modal::clientOptions disable support.

Support PostgreSQL in QueryBuilder

debug panel : change json_encode/decode to serialise/unserialise to prevent non-UTF characters error

More on GII buttons [skip ci]

* '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
  ...

fixes #997

defaults overided settings

GII sub-modules support [skip ci]

[Work in progress] I18n icu

Added intl check to tests, better error reporting, credited Aura.Intl for the most complex test pattern

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).

* master: (103 commits)
  fixed broken test after whitespace changes in view
  Removed the extra EOLs.
  I add new line in methods that render code in the head and for body
  GII update button style
  GII create object button style [skip ci]
  Fixes #980: Changed the default way of generating action URLs for ActionColumn.
  View default value for $params
  adjusted cubrid version in schema quote
  removed cubrid env from tavis.yml
  simplified cubrid db install on travis
  fixed cubrid schema test for pdo type
  fixed validator test break
  added cubrid specific pdo type casting
  Updated FileValidator tests
  Better AR connection init in tests
  Removed @codeCoverageIgnore
  no xss for attribute error messages that contain {value}
  Clientvalidation {value} was not what has been validated
  moved getPdoType() to Schema.
  optimized datepick js code.
  ...

Conflicts:
	framework/yii/base/View.php