* 'master' of github.com:yiisoft/yii2:
  set default format for gridview to text

correct creation of new Sort object if none is there

set default format for gridview to text

use milliseconds only and fall back to seconds for older memcache
versions.

default format is text in short format so it should also be
like that in array() defintion.

Bug in XML format

Fixes #795: do not generate form-control css class for file input as it would display an unneeded border.

Missing SemiKolon in module generator module template

missing semikolon after namespace in module template

Update alert widget

typo path fix