Merge branch 'master' into lighting

Conflicts:
	GUI/TextBox.cpp
	Graphics/RenderManager.hpp
	data/scripts/main.lua
	premake4.lua