upload 620
vincent-Merge github.com:kimmykuang/Yii-phpexcel

Conflicts:
	protected/runtime/application.log
	protected/views/site/index.php
Merge github.com:kimmykuang/Yii-phpexcel
Merge github.com:kimmykuang/Yii-phpexcel
Merge github.com:kimmykuang/Yii-phpexcel
vincent-6-25
vincent-6-26 Merge github.com:kimmykuang/Yii-phpexcel

Conflicts:
	protected/runtime/application.log
vincent-6-28Merge github.com:kimmykuang/Yii-phpexcel

Conflicts:
	protected/views/layouts/main.php
	protected/views/site/index.php