Merged with master.
Fixed a compile error.
Updated titlescreen and fixed lobby music.
Merged with master.