Merge remote-tracking branch 'origin/master'

app/client/templates/playlist.html

@@ -1,5 +1,5 @@
 <template name="playlist">
-    <input type="text" id="search-playlist" placeholder="Search for a song..."  onfocus="this.placeholder = ''" onblur="this.placeholder = 'Search playlist...'" />
+    <input type="text" id="search-playlist" placeholder="Search playlist..."  onfocus="this.placeholder = ''" onblur="this.placeholder = 'Search playlist...'" />
     <ul id="playlist">
       {{#each playlist_songs}}
         <li class="pl-item">