Added location, made player use location object, did some other stuff
Merge remote-tracking branch 'origin/master'