Incomplete - [#2017] Error eliminar una imagen de galería

Implementing __eq__ and __ne__ so that the resource to be deleted can be
recognized with 'self in self._idevice.userResources'
Merge remote-tracking branch 'origin/master' into mclois
Merge remote-tracking branch 'origin/master' into mclois

Conflicts:
	exe/engine/resource.py
Merge remote-tracking branch 'origin/master' into mclois
Fixed [#2017] "Mistake to remove an image from gallery"
Apply solution in commit 308335bc7c222f6856e4f01a5a77b14e597c9376
Add functionality to create and queue TinCan statement for MCQ
dos2unix on a couple of files
Evitar que las imágenes alargadas con texto al a derecha se salgan del
iDevice (ver estilo INTEF, content.css líneas del 79-82 por Ignacio Gros
<ignacio@gros.es>)
TinyMCE: Adding a new empty line after the Predefined Template Content to make it easier to add new paragraphs.
TinyMCE: No new base64 images.
Revert 2 last LOM-ES vocab changes
Fix [#2093] Exportación IMS CP no incluye metadatos LOM-es
HTML5: Better use of DIV, SECTION and ARTICLE.
Merge branch 'master' of git+ssh://forja.cenatic.es//var/lib/gforge/chroot/scmrepos/git/iteexe/iteexe
Adapting to HTML5.
Previous/Next buttons: HTML5 NAV tag.
Fix [#2099] Cambio de licencia en propiedades paquete no refresca en LOM
ES
It failed when the hint was empty: Coercing to Unicode: need string or buffer, NoneType found when...
Merge branch 'master' of git+ssh://forja.cenatic.es//var/lib/gforge/chroot/scmrepos/git/iteexe/iteexe
Fix [#2084] No reconoce campos de propiedades paquete elp de versión 7.2