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

Conflicts:
	src/main/resources/hibernate.cfg.xml
	src/main/resources/servlet-Test-context.xml