Trabajando con las camaras
Merge branch 'master' of https://github.com/ssii1213/eAdventure-Character-Configurator-Tool

Conflicts:
	src/es/eucm/character/main/Application.java