cambio i arreglo
comments prueva
Merge remote-tracking branch 'origin/master'

Conflicts:
	www/index.html
	www/js/api.js
	www/main.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	spot-server/spot-api/src/main/java/edu/upc/eetac/dsa/dsaqp1314g1/spot/api/MediaType.java
	www/main.js