Merge pull request #104 from Soundnode/develop

Fix save to fav on search state
fix merge conflict