popular songs rake task finished
merge
Merge branch 'feature/user_signup_login' of https://github.com/SmileZero/muse_server
add recommend
Merge branch 'master' of https://github.com/SmileZero/muse_server
Merge branch 'master' into feature/tags_songs_json
restore before setting server