Finished integrating caption aider.
Merge remote-tracking branch 'origin/Player2.0' into Player2.0