1
Merge github.com:kimmykuang/Yii-phpexcel

Conflicts:
	protected/runtime/application.log