Update master
General fixes
Conflicts: osu.Game/osu.Game.csproj
Cheers @RemieRichards
Missing timing points, events, and hit object decoders remain to be written