Retoques Resources
Cambios autentificación
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	netsound-server/netsound-api/src/main/java/edu/upc/eetac/dsa/dsaqt1314g4/netsound/api/PlaylistResource.java
	netsound-server/netsound-api/src/main/java/edu/upc/eetac/dsa/dsaqt1314g4/netsound/api/SongResource.java
cosas