Added basic shaders and changed name for directX
Merge remote-tracking branch 'origin/master' into collisions