ghz temp
New changelist
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/runtime/application.log
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/config/main.php
Merge remote-tracking branch 'origin/master'
ghz  自我介绍及自我介绍评论
ghz
Merge remote-tracking branch 'origin/master'