Massive merge

Need to re-add Wryn, lobby splash and such.