deleted:    protected/modules/gong/modules/file/controllers/GFileController.php.orig
	modified:   protected/modules/gong/modules/file/models/GFileImage.php
	modified:   protected/modules/gong/modules/file/models/GFileVideo.php
	modified:   protected/yiic
	modified:   protected/yiic.php