Merge gamejam-deadline into master

I merged gamejam-deadline into master, and there were a bunch of conflicts so simply resolved them towards gamejam-deadline.

No other changes.