Fix bugs
Merge branch 'master' of https://github.com/alvaropascualcrespo/Camara

Conflicts:
	GLProj3D.exe
	GLProj3D.tds