Cambios resourcces
Merge remote-tracking branch 'origin/master'

Conflicts:
	netsound-server/netsound-api/src/main/java/edu/upc/eetac/dsa/dsaqt1314g4/netsound/api/PlaylistResource.java
Quitar on cascade de SQL