Fixed: Recompile error and textures in the wrong dir
Fixed: Recompile errors
Merge remote-tracking branch 'origin/master'