* 'master' of git://github.com/yiisoft/yii2:
  Updated framework paths in composer.json
  Moved "framework" to "iii".
  Fixed Yii::importNamespaces() bug.
  Fixes issue #174: make URL parameters available in $_GET.
  refactoring.
  Removed static variable from autoload per qiangxue's suggestion
  Renamed yii.php -> Yii.php for class, filename consitency
  created StringHelper::basename()
  Fixed YiiBaseTest echo
  Check if trait was loaded