Modify the acts
Merge remote-tracking branch 'origin/master'
Fixed act holder feature bug