Merge branch 'ui'
Corrected message on homepage: it should be written "top right corner" instead of "left top corner", for the add music button.
Added fix: when an action over network starts (one with a conversationId) but the previous conversation, which was a MUSIC_GET_TO_PLAY is not over (music hasn't finished loading) : even if conversationIds are different, the second message is handled.
Merge branch 'master' into ui