Conflicts:
	framework/yii/validators/RegularExpressionValidator.php

also fixed some inconsistency between client and server validation.

Total 0 items. when list is empty.
and showing x out of x for n>0 and paging on.

Filter only active attributes in gridview

When we do not want an attribute to be searched we do not define it in
the filter model, or mark it inctive in the scenario when we use the
original model.
GridView should not try to access the attribute then and automatically
not display the filter field.

* 'master' of github.com:yiisoft/yii2:
  fixes issue with debugmodule initializing view component too early

consistent api for safe and required

fixes issue with debugmodule initializing view component too early

fixes #929

* 'master' of github.com:yiisoft/yii2:
  Fixes #968: clientOptions should not be ignored when enabling internationalization.
  minor doc fix.

when error occurs while handling errors output was not readable in web
context

fixes #964

not need to suggest packages in core. They are required by extension
composer.json anyway.

* 'master' of github.com:yiisoft/yii2:
  added comment
  better error message
  more asset bundle tests and docs
  fix issue #700
  doc fix
  added unit test for asset bundles

fixes #963

fix js asset position conflict

fixes #961

adjust depended asset position or throw exception on conflict