Moved app to root dir
gitignore changes
gitignore
Merge branch 'master' of https://github.com/castillobg/sound-point

Conflicts:
	.gitignore
gitignore
lista de amigos arreglada y lista de invitaciones
poll invitaciones
Remove song.
Merge branch 'master' of https://github.com/castillobg/sound-point
fixes
Merge branch 'master' of https://github.com/castillobg/sound-point
reproduciendo cuando se añade una cancion y no hay nada en cola
polling songs to refresh a station.
añadiendo invitaciones aceptadas
ajustes HU eliminar estaciones
Changes in station songs polling.
Merge branch 'master' of https://github.com/castillobg/sound-point into edwinval
pequeño cambio en HU eliminar estacion