Merge branch 'texture_extraction' of github.com:PhilippKopp/eos

Conflicts:
	CMakeLists.txt: Just merged the new affine renderer headers and texture_extraction.hpp.

CMakeLists.txt

@@ -90,6 +90,7 @@ set(HEADERS
 	include/eos/render/utils.hpp
 	include/eos/render/render_affine.hpp
 	include/eos/render/detail/render_detail.hpp
+	include/eos/render/texture_extraction.hpp
 )
 
 # Add header includes: