Merge branch 'evaluation'
Merge branch 'Parker'
fixed the loading and unloading of assets

also fixed a threading issue that was not apparent on the windows
client that popped up in the mac client, due to accessing namespaces in
static global scope.
Music

I tried coding some objects. Im not sure if i did it the right way, but
i just made the majority of them play on load in a loop. I also included
the music I tried to use for each object, their names are self
explanatory.
Merge branch 'master' into Parker