Cambios menores
Merge branch 'master' of https://github.com/zadik/TravelShare

Conflicts:
	TrabajoIT/nbproject/private/private.xml
	TrabajoIT/src/java/strut/CiudadesAction.java
	TrabajoIT/web/WEB-INF/struts-config.xml