Merge branch 'feature/Harmony'

Conflicts:
	package.json

package.json

@@ -20,7 +20,7 @@
     "eibd": "^0.3.1",
     "elkington": "kevinohara80/elkington",
     "hap-nodejs": "^0.0.2",
-    "harmonyhubjs-client": "^1.1.4",
+    "harmonyhubjs-client": "enriquez/harmonyhubjs-client#patch-1",
     "harmonyhubjs-discover": "git+https://github.com/swissmanu/harmonyhubjs-discover.git",
     "komponist": "0.1.0",
     "lifx": "git+https://github.com/magicmonkey/lifxjs.git",
@@ -30,7 +30,9 @@
     "node-icontrol": "^0.1.5",
     "node-milight-promise": "0.0.x",
     "node-persist": "0.0.x",
+    "node-xmpp-client": "1.0.0-alpha23",
     "q": "1.4.x",
+    "queue": "^3.1.0",
     "request": "2.49.x",
     "sonos": "0.8.x",
     "telldus-live": "^0.2.1",