fix namespace
Merge remote-tracking branch 'origin/master'

* origin/master:
  yiistrap and yiiwheels helpers import
  Update main.php
  Update composer.json to reflect advanced instead of basic