CS fixes.
Merge branch 'master' of github.com:yiisoft/yii2

Conflicts:
	apps/bootstrap/index.php
	yii/yiic.php