Bugs behoben
Bug behoben
Commit to siwitch
Bloom
Bullet ordner in External
Bullet ordner in External
Merge branch 'master'

Conflicts:
	Debug/TheWall.ilk
	Debug/TheWall.pdb
	TheWall.v11.suo
	TheWall/TheWall.vcxproj.filters
	TheWall/main.cpp
	build-Debug/CL.read.1.tlog
	build-Debug/CL.write.1.tlog
	build-Debug/Cube.obj
	build-Debug/Ground.obj
	build-Debug/Key.obj
	build-Debug/MausKeyboard.obj
	build-Debug/SceneObject.obj
	build-Debug/Shader.obj
	build-Debug/Stone.obj
	build-Debug/Texture.obj
	build-Debug/TheWall.log
	build-Debug/Tree.obj
	build-Debug/Triangle.obj
	build-Debug/cl.command.1.tlog
	build-Debug/link.command.1.tlog
	build-Debug/link.read.1.tlog
	build-Debug/link.write.1.tlog
	build-Debug/main.obj
	build-Debug/vc110.idb
	build-Debug/vc110.pdb