Merge branch 'master' into develop
Agregamos funciones para mover la camara.
Merge branch 'develop'

Conflicts:

OpenGl/OpenGl.xcodeproj/project.xcworkspace/xcuserdata/DAN.xcuserdatad/U
serInterfaceState.xcuserstate
	OpenGl/OpenGl/main.cpp