merge
merge
WASD fix, specular shader, bump map