Spring MVC dependencies
derby dependency
martina haciendo pruebas
Merge remote-tracking branch 'origin/dev'

Conflicts:
	pom.xml
	src/main/webapp/WEB-INF/web.xml
Merge branch 'dev'

Conflicts:
	src/main/java/ar/edu/utn/frba/tacs/grupo1/controller/FeedController.java
	src/main/java/com/cloudbees/connection/DbConnection.java
	src/main/java/com/cloudbees/daos/SubscriptionDAO.java
	src/main/java/com/cloudbees/models/Feed.java
	src/main/java/com/cloudbees/models/Subscription.java
	src/main/java/com/cloudbees/models/Usuario.java
	src/main/webapp/WEB-INF/pages/hello.jsp
	src/test/java/com/cloudbees/connection/DbConnectionTest.java
	src/test/java/com/cloudbees/daos/SubscriptionDAOTest.java
Merge branch 'dev'
Merge branch 'dev'
Parser de XML basico + Test con forma de uso
Merge branch 'dev'
Merge remote-tracking branch 'origin/dev'

Conflicts:
	pom.xml
merge  v2