Merge branch 'master' of https://github.com/luislezcair/IAgents

Conflicts:
	src/main/java/ia/agents/ontology/Alojamiento.java
	src/main/java/ia/agents/ontology/Transporte.java
	src/main/java/ia/agents/ui/UIAgencia.form
	src/main/java/ia/agents/ui/UILugar.form
	src/main/java/ia/agents/ui/UILugar.java
	src/main/java/ia/agents/ui/UITransporte.form
	src/main/java/ia/agents/ui/UITransporte.java
	src/main/java/ia/agents/ui/UITurista.form
	src/main/java/ia/agents/ui/UITurista.java