mapeo de Entry
Merge branch 'dev' of
https://github.com/hernan-pieroni/tacs-feedsReader.git into dev

Conflicts:
	src/main/java/ar/edu/utn/frba/tacs/grupo1/domain/Subscription.java
	src/main/resources/ar/edu/utn/frba/tacs/grupo1/domain/Subscription.hbm.xml