etwert


Change-Id: Ifad5f3013ee3f8a859b5e3a3242d882b552f2e6d
Signed-off-by: juanpemb <juanpemb@gmail.com>
Merge branch 'master' of
https://juanpemb@github.com/juanpemb/cruises-spider.git

Conflicts:
	cruises-downloader/src/main/java/org/jp/downloader/api/Categoria.java