* master: (131 commits)
  css fix.
  Finished model generator.
  more tests for FileHelper
  Added note about theme asset bundle to bootstrap widgets guide
  fixed typos in ArrayHelperBase phpdoc
  More tests for ArrayHelper and Inflector
  Fixed typo and code style
  Fixes #21: implemented jQueryUI Slider
  Fixes #790: added visible for Nav and Dropdown
  finished rule generation for model generator.
  bug fix of form generator.
  minor fixes of debugger.
  Added SafeValidator.
  fix dataProvider getSort()
  cleanup MemCache timeout API after #804
  Added failureCallback, reduced timeouts to 1s
  Mentioning that timeoutms is available in memcache only.
  set default format for gridview to text
  Removed extra line
  Added timeoutms parameter in MemCache
  ...

Conflicts:
	tests/unit/data/config.php

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