removes turbolinks, work on playlist and song js
fixes merge conflicts