fixed song info on user show page and secret edit page
fix merge conflicts
soundcloud functionality
Merge soundcloud