Merging showtime plugin into master
Merging with main unity branch
Fixed merge conflicts