Merge branch 'master' of github.com:yiisoft/yii2 into 313-Inflector-Helper

* 'master' of github.com:yiisoft/yii2:
  updated the README file of the bootstrap app.
  readjusting files for the framework package.
Inflector second revision
Merge branch 'upstream' into 313-Inflector-Helper

* upstream:
  Fixes issue #320: Module::createController() will fail with a route with trailing slash.
  Fixed test break about AssetController.
  requirements css.php twitter bootstrap update to 2.3.2
  Twitter bootstrap updated to 2.3.2
  Modified the IAssetConvert interface.
  hashing the key for registerCss and registerJs.
  Update AccessRule.php
  refactored code after feedback
  Fixed framework path.
  Added support for View::POS_READY.
  new proposed structure
  remove from master (update track)
  made some changes, fix some pitfalls, remove PHP_EOL
  #20 proposed architecture for bootstrap

Conflicts:
	yii/helpers/base/Inflector.php
added tests
finished all tests
Merge branch 'upstream' into 313-Inflector-Helper

* upstream:
  Enhanced the detection of secure connection.
  Refactored Modal.
  < PHP 5.3 compatibility for req checker
  code style and UI improvements to requirements checker
  readded accidentally removed .gitignore file
  Changed Yii.php case in some files where it was wrong
  Finished bootstrap Widget and Modal.
  PHP Intl extension has been added to default Yii requirements.
  moved optional packages to "suggest", updated platform requirements
  "vendor-dir": "vendor" is default, removed
  fixed auth manager unit test to not expect generic exception
  fixed range requests, tests improved
fix failing test
fix phpdoc of underscore
Merge branch 'upstream' into 313-Inflector-Helper

* upstream: (36 commits)
  bug fix.
  Added composer extension.
  Added psr-0.
  Fixed breaking test.
  Fixed iii include path.
  reorganized the main repo to satisfy PSR-0.
  Fixed bootstrap asset registration issue.
  Widget::$transition removed, bundles depency fixed
  'yii/bootstrap/popover' bundle depency optimization
  Bundle names fixes, base widget fixes, other widgets fixes
  Fixed join query for AR.
  Responsive bundle depency fix
  Bundle names and depency fixes
  YiiBase move all after class definition
  YiiBase
  Reloaded
  Additional bootstrap packages
  New approach
  minor refactoring.
  Uncompressed assets js files for better overall compression
  ...
ported inflection methods from StringHelper to Inflector helper class
added inflection methods from StringHelper + some comment fixes
JQuery UI bundle assets
JQuery UI bundle assets config
Datepicker language assets dependencies
Theme dependencies
jui.widget dependency
fixed pluralize + singularize rules for tests
Merge branch 'upstream' into 313-Inflector-Helper

* upstream:
  Fixes #312. Additional docs on IDN in EmailValidator and UrlValidator.
fixed tests
jui.effect and jui.position dependencies