Resolved merge conflicts
UPdated paths for realtime fixtures. Tested that make map still works (with known good datafile).