Merge remote-tracking branch 'origin/send-message'

diff --cc htdocs/index.html
index 98d7e98,0ed3f94..08c0d05
--- 1/htdocs/index.html
--- 2/htdocs/index.html
+++ b/htdocs/index.html
@@@ -55,7 -55,11 +55,12 @@@
                <span class="glyphicon glyphicon-forward"></span>
              </button>
            </div>
 +<!--          
+           <div class="btn-group">
+             <button id="btnlove" type="button" class="btn btn-default" onclick="clickLove();">
+               <span class="glyphicon glyphicon-heart"></span>
+             </button>
+           </div>
            <div class="btn-group">
              <div class="btn btn-toolbar btn-default">
                <span id="volume-icon" class="glyphicon glyphicon-volume-up"></span>

diff --cc htdocs/js/mpd.js
Simple merge

diff --cc src/mpd_client.c
Simple merge

diff --cc src/mpd_client.h
index 361afe6,1fde010..9ab4360
--- 1/src/mpd_client.h
--- 2/src/mpd_client.h
+++ b/src/mpd_client.h
@@@ -47,8 -47,8 +47,9 @@@
      X(MPD_API_SAVE_QUEUE) \
      X(MPD_API_RM_TRACK) \
      X(MPD_API_RM_ALL) \
 +    X(MPD_API_MOVE_TRACK) \
      X(MPD_API_SEARCH) \
+     X(MPD_API_SEND_MESSAGE) \
      X(MPD_API_SET_VOLUME) \
      X(MPD_API_SET_PAUSE) \
      X(MPD_API_SET_PLAY) \