update
update
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/common/models/BoxHeader.php