Mapeamento plane
Merge branch 'master' of https://github.com/vitormota/LAIG-2013-2014

Conflicts:
	src/Primitive.cpp
	src/Scene.cpp
	src/Shader.cpp