Merge branch 'development' of github.com:Nitri0/prometeo-abc into development

Conflicts:
	prometeo/prometeo-abc.blend
Merge branch 'master' of github.com:franjvasquezg/prometeo-abc into development

Conflicts:
	prometeo/prometeo-abc.blend
arreglando fallas de texutras
Merge branch 'development'

Conflicts:
	prometeo/prometeo-abc.blend