gui progress
Merge branch 'master' of https://github.com/castillobg/sound-point
Merge branch 'master' of https://github.com/castillobg/sound-point
no message
Voting refresh fix
Merge branch 'master' of https://github.com/castillobg/sound-point
so many fixes
Merge branch 'master' of https://github.com/castillobg/sound-point
Pimpin' yo app.
HTML fixes (added 'add friend' button again and changed friends modal images not to be links)
Added Soundcloud logo in station view and large current song artwork.
Station fix (added song is set as current if there are no more songs on the station's list)
Merge branch 'master' of https://github.com/castillobg/sound-point into edwinval

Conflicts:
	public/index.html
 actualizacion pull master
Merge branch 'master' of https://github.com/castillobg/sound-point into edwinval
HU de eliminar usuarios de las emisoras;
se refleja en la base de datos y solo es permitido para el dueño de la estacion
unitesting
Merge branch 'master' of https://github.com/castillobg/sound-point
test
Pequeños cambios en el css.
Debería arreglar lo del espacio blanco.