Cambios en Android
Merge remote-tracking branch 'origin/master'

Conflicts:
	videoshare-server/videoshare-api/src/main/java/edu/upc/eetac/dsa/dsaqt1314g2/videoshare/api/VideoshareResource.java
	videoshare-server/videoshare-api/src/main/java/edu/upc/eetac/dsa/dsaqt1314g2/videoshare/api/model/Videos.java
Cambio pom