Merge origin/master

Conflicts:
	MusicTecPlayer/src/musictecplayer/vistas/DetallesCancion.java