Vamos que lo conseguimos!!!!!!!!
Merge remote-tracking branch 'origin/dsadevelopers' into dsadevelopers

Conflicts:
	AnakinKarts-android/AndroidManifest.xml
	AnakinKarts-android/assets/config.properties
	AnakinKarts-android/src/edu/upc/eetac/dsa/dsaqp1314g3/AnakinKarts/android/AnakinKartsMainActivity.java
	AnakinKarts-android/src/edu/upc/eetac/dsa/dsaqp1314g3/AnakinKarts/android/HomeActivity.java
	AnakinKarts-server/AnakinKarts-api/pom.xml
	AnakinKarts-server/AnakinKarts-api/src/main/java/edu/upc/eetac/dsa/dsaqp1314g3/AnakinKarts/api/EventoResource.java
	AnakinKarts-server/AnakinKarts-api/src/main/java/edu/upc/eetac/dsa/dsaqp1314g3/AnakinKarts/api/model/Evento.java
	AnakinKarts-server/AnakinKarts-api/src/main/java/edu/upc/eetac/dsa/dsaqp1314g3/AnakinKarts/api/model/EventoCollection.java
	AnakinKarts-server/AnakinKarts-api/src/main/webapp/WEB-INF/web.xml
	sql/AnakinKartsdb-data.sql
	sql/AnakinKartsdb-schema.sql
	www/anakin_eventos.html
	www/js/evento.js