22072014 182125 Itinerarios y detalle itinerarios
25072014 150025 Expiración controlada, look and feel
Merge origin/master

Conflicts:
	src/main/resources/messages_es.properties
Merge origin/master

Conflicts:
	src/main/resources/messages_es.properties