Merge
merge
Merge branch 'master' of https://github.com/clucasa/Olympus

Conflicts:
	Olympus/ApexCloth.cpp
	Olympus/ConstBuffers.h
	Olympus/LightHelper.h
	Olympus/LightHelper.hlsl
	Olympus/Olympus.vcxproj.filters
	Olympus/RenderManager.cpp
	Olympus/Scene/archway.txt
	Olympus/Scene/bigbadman.txt
	Olympus/Scene/torch.txt
	Olympus/Scene/trees.txt
	Olympus/apex.h
Cloth stuff