Merge branch 'master' of https://github.com/juanpemb/dx-dowloader.git

Conflicts:
	dx-downloader/src/com/jp/api/Articulo.java
Merge branch 'master' of https://github.com/juanpemb/dx-dowloader.git