Merge branch 'pr/101'

Conflicts:
	source/components/index.markdown

source/_components/alarm_control_panel.manual.markdown

@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Alarm Control Panel
 ---
 
 <img src='/images/supported_brands/preferences-system-privacy.png' class='brand pull-right' />

source/_components/alarm_control_panel.mqtt.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: mqtt.png
+ha_category: "Alarm Control Panel"
 ---
 
 <img src='/images/supported_brands/mqtt.png' class='brand pull-right' />

source/_components/arduino.markdown

@@ -7,6 +7,10 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: arduino.png
+ha_category: DIY
+logo: arduino.png
+ha_category: Hub
 ---
 
 <img src='/images/supported_brands/arduino.png' class='brand pull-right' />

source/_components/browser.markdown

@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Other
 ---
 
 <img src='/images/supported_brands/web-browser.png' class='brand pull-right' />

source/_components/camera.foscam.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: foscam.png
+ha_category: Camera
 ---
 
 <img src='/images/supported_brands/foscam.png' class='brand pull-right' />

source/_components/camera.generic.markdown

@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Camera
 ---
 <img src='/images/supported_brands/camera-web.png' class='brand pull-right' />
 

source/_components/device_tracker.actiontec.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: actiontec.png
+ha_category: Presence Detection
 ---
 
 <img src='/images/supported_brands/actiontec.png' class='brand pull-right' />

source/_components/device_tracker.aruba.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: aruba.png
+ha_category: Presence Detection
 ---
 
 <img src='/images/supported_brands/aruba.png' class='brand pull-right' />

source/_components/device_tracker.asuswrt.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: asus.png
+ha_category: Presence Detection
 ---
 
 <img src='/images/supported_brands/asus.png' class='brand pull-right' />

source/_components/device_tracker.ddwrt.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: ddwrt.png
+ha_category: Presence Detection
 ---
 
 <img src='/images/supported_brands/ddwrt.png' class='brand pull-right' />

source/_components/device_tracker.geofancy.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: geofancy.png
+ha_category: Presence Detection
 ---
 
 <img src='/images/supported_brands/geofancy.png' class='brand pull-right' />

source/_components/device_tracker.luci.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: openwrt.png
+ha_category: Presence Detection
 ---
 
 <img src='/images/supported_brands/openwrt.png' class='brand pull-right' />

source/_components/device_tracker.mqtt.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: mqtt.png
+ha_category: Presence Detection
 ---
 
 <img src='/images/supported_brands/mqtt.png' class='brand pull-right' />

source/_components/device_tracker.netgear.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: netgear.png
+ha_category: Presence Detection
 ---
 
 <img src='/images/supported_brands/netgear.png' class='brand pull-right' />

source/_components/device_tracker.nmap_scanner.markdown

@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Presence Detection
 ---
 
 <img src='/images/supported_brands/network-workgroup.png' class='brand pull-right' />

source/_components/device_tracker.owntracks.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: owntracks.png
+ha_category: Presence Detection
 ---
 
 <img src='/images/supported_brands/owntracks.png' class='brand pull-right' />

source/_components/device_tracker.snmp.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: network-snmp.png
+ha_category: Presence Detection
 ---
 
 <img src='/images/supported_brands/network-snmp.png' class='brand pull-right' />

source/_components/device_tracker.thomson.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: technicolor.png
+ha_category: Presence Detection
 ---
 
 <img src='/images/supported_brands/technicolor.png' class='brand pull-right' />

source/_components/device_tracker.tomato.markdown

@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Presence Detection
 ---
 
 <img src='/images/supported_brands/network-wired-disconnected.png' class='brand pull-right' />

source/_components/device_tracker.tplink.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: tp-link.png
+ha_category: Presence Detection
 ---
 
 <img src='/images/supported_brands/tp-link.png' class='brand pull-right' />

source/_components/downloader.markdown

@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Other
 ---
 
 <img src='/images/supported_brands/emblem-downloads.png' class='brand pull-right' />

source/_components/ifttt.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: ifttt.png
+ha_category: Other
 ---
 <img src='/images/supported_brands/ifttt.png' class='brand pull-right' />
 [IFTTT](https://ifttt.com) is a web service that allows users to create chains of simple conditional

source/_components/isy994.markdown

@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Hub
 ---
 
 ### Basic Configuration ###

source/_components/keyboard.markdown

@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Other
 ---
 
 <img src='/images/supported_brands/input-keyboard.png' class='brand pull-right' />

source/_components/light.blinksticklight.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: blinkstick.png
+ha_category: Light
 ---
 
 <img src='/images/supported_brands/blinkstick.png' class='brand pull-right' />

source/_components/light.hue.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: philips_hue.png
+ha_category: Light
 ---
 
 <img src='/images/supported_brands/philips_hue.png' class='brand pull-right' />

source/_components/light.limitlessled.markdown

@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Light
 ---
 
 <img src='/images/supported_brands/dialog-information.png' class='brand pull-right' />

source/_components/light.rfxtrx.markdown

@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Light
 ---
 The rfxtrx platform support lights that communicate in the frequency range of 433.92 MHz.
 

source/_components/light.tellstick.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: telldus_tellstick.png
+ha_category: Light
 ---
 
 <img src='/images/supported_brands/telldus_tellstick.png' class='brand pull-right' />

source/_components/light.vera.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: vera.png
+ha_category: Light
 ---
 
 <img src='/images/supported_brands/vera.png' class='brand pull-right' />

source/_components/light.wink.markdown

@@ -1,16 +1,17 @@
 ---
 layout: page
-title: "Wink sensors"
-description: "Instructions how to setup the Wink sensors within Home Assistant."
+title: "Wink lights"
+description: "Instructions how to setup the Wink lights within Home Assistant."
 date: 2015-01-20 22:36
 sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: wink.png
+ha_category: Light
 ---
 
 <img src='/images/supported_brands/wink.png' class='brand pull-right' />
 The wink sensor platform allows you to use your [Wink](http://www.wink.com/) lights.
 
 The requirement is that you have setup your [Wink hub](/components/light.wink.html).
-

source/_components/media_player.cast.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: google_cast.png
+ha_category: Media Player
 ---
 
 <img src='/images/supported_brands/google_cast.png' class='brand pull-right' />

source/_components/media_player.denon.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: denon.png
+ha_category: Media Player
 ---
 
 <img src='/images/supported_brands/denon.png' class='brand pull-right' />

source/_components/media_player.firetv.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: firetv.png
+ha_category: Media Player
 ---
 
 <img src='/images/supported_brands/firetv.png' class='brand pull-right' />

source/_components/media_player.itunes.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: itunes.png
+ha_category: Media Player
 ---
 
 <img src='/images/supported_brands/itunes.png' class='brand pull-right' />

source/_components/media_player.kodi.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: kodi.png
+ha_category: Media Player
 ---
 
 <img src='/images/supported_brands/kodi.png' class='brand pull-right' />

source/_components/media_player.mpd.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: mpd.png
+ha_category: Media Player
 ---
 
 <img src='/images/supported_brands/mpd.png' class='brand pull-right' />

source/_components/media_player.plex.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: plex.png
+ha_category: Media Player
 ---
 
 <img src='/images/supported_brands/plex.png' class='brand pull-right' />

source/_components/media_player.sonos.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: sonos.png
+ha_category: Media Player
 ---
 
 <img src='/images/supported_brands/sonos.png' class='brand pull-right' />

source/_components/media_player.squeezebox.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: logitech.png
+ha_category: Media Player
 ---
 
 <img src='/images/supported_brands/logitech.png' class='brand pull-right' />

source/_components/modbus.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: modbus.png
+ha_category: Hub
 ---
 
 <img src='/images/supported_brands/modbus.png' class='brand pull-right' />

source/_components/notify.file.markdown

@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Notify
 ---
 
 <img src='/images/supported_brands/text-x-generic.png' class='brand pull-right' />

source/_components/notify.instapush.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: instapush.png
+ha_category: Notify
 ---
 
 <img src='/images/supported_brands/instapush.png' class='brand pull-right' />

source/_components/notify.nma.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: nma.png
+ha_category: Notify
 ---
 
 <img src='/images/supported_brands/nma.png' class='brand pull-right' />

source/_components/notify.pushbullet.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: pushbullet.png
+ha_category: Notify
 ---
 
 <img src='/images/supported_brands/pushbullet.png' class='brand pull-right' />

source/_components/notify.pushover.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: pushover.png
+ha_category: Notify
 ---
 
 <img src='/images/supported_brands/pushover.png' class='brand pull-right' />

source/_components/notify.slack.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: slack.png
+ha_category: Notify
 ---
 
 <img src='/images/supported_brands/slack.png' class='brand pull-right' />

source/_components/notify.smtp.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: smtp.png
+ha_category: Notify
 ---
 
 <img src='/images/supported_brands/smtp.png' class='brand pull-right' />

source/_components/notify.syslog.markdown

@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Notify
 ---
 
 <img src='/images/supported_brands/applications-system.png' class='brand pull-right' />

source/_components/notify.telegram.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: telegram.png
+ha_category: Notify
 ---
 
 <img src='/images/supported_brands/telegram.png' class='brand pull-right' />

source/_components/notify.xmpp.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: xmpp.png
+ha_category: Notify
 ---
 
 <img src='/images/supported_brands/xmpp.png' class='brand pull-right' />

source/_components/rfxtrx.markdown

@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Hub
 ---
 The rfxtrx component supports RFXtrx devices by [RFXCOM](http://www.rfxcom.com) which communicate in the frequency range of 433.92 MHz.
 

source/_components/script.markdown

@@ -27,14 +27,14 @@ script:
           entity_id: device_tracker.paulus
           domain: light
       - alias: Bedroom lights on
-        execute_service: light.turn_on
-        service_data:
+        service: light.turn_on
+        data:
           entity_id: group.bedroom
       - delay:
           # supports seconds, milliseconds, minutes, hours, etc.
           minutes: 1
       - alias: Living room lights on
-        execute_service: light.turn_on
-        service_data:
+        service: light.turn_on
+        data:
           entity_id: group.living_room
 ```

source/_components/sensor.arduino.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: arduino.png
+ha_category: Sensor
 ---
 
 <img src='/images/supported_brands/arduino.png' class='brand pull-right' />

source/_components/sensor.arest.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: arest.png
+ha_category: Sensor
 ---
 
 <img src='/images/supported_brands/arest.png' class='brand pull-right' />

source/_components/sensor.bitcoin.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: bitcoin.png
+ha_category: Sensor
 ---
 
 <img src='/images/supported_brands/bitcoin.png' class='brand pull-right' />

source/_components/sensor.command_sensor.markdown

@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Sensor
 ---
 
 <img src='/images/supported_brands/utilities-terminal.png' class='brand pull-right' />

source/_components/sensor.cpuspeed.markdown

@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Sensor
 ---
 
 <img src='/images/supported_brands/utilities-system-monitor.png' class='brand pull-right' />

source/_components/sensor.dht.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: dht.png
+ha_category: DIY
 ---
 
 <img src='/images/supported_brands/dht.png' class='brand pull-right' />

source/_components/sensor.efergy.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: efergy.png
+ha_category: Sensor
 ---
 
 <img src='/images/supported_brands/efergy.png' class='brand pull-right' />

source/_components/sensor.forecast.markdown

@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Weather
 ---
 
 <img src='/images/supported_brands/weather-few-clouds.png' class='brand pull-right' />

source/_components/sensor.glances.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: glances.png
+ha_category: Sensor
 ---
 
 <img src='/images/supported_brands/glances.png' class='brand pull-right' />

source/_components/sensor.modbus.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: modbus.png
+ha_category: Sensor
 ---
 
 <img src='/images/supported_brands/modbus.png' class='brand pull-right' />

source/_components/sensor.mqtt.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: mqtt.png
+ha_category: Sensor
 ---
 
 <img src='/images/supported_brands/mqtt.png' class='brand pull-right' />

source/_components/sensor.mysensors.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: mysensors.png
+ha_category: Sensor
 ---
 
 <img src='/images/supported_brands/mysensors.png' class='brand pull-right' />

source/_components/sensor.openweathermap.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: openweathermap.png
+ha_category: Weather
 ---
 
 <img src='/images/supported_brands/openweathermap.png' class='brand pull-right' />

source/_components/sensor.rest.markdown

@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Sensor
 ---
 
 <img src='/images/supported_brands/rest.png' class='brand pull-right' />

source/_components/sensor.rfxtrx.markdown

@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Sensor
 ---
 The rfxtrx platform support sensors that communicate in the frequency range of 433.92 MHz.
 

source/_components/sensor.rpi_gpio.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: raspberry-pi.png
+ha_category: Sensor
 ---
 
 <img src='/images/supported_brands/raspberry-pi.png' class='brand pull-right' />

source/_components/sensor.sabnzbd.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: sabnzbd.png
+ha_category: Sensor
 ---
 
 <img src='/images/supported_brands/sabnzbd.png' class='brand pull-right' />

source/_components/sensor.swiss_public_transport.markdown

@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Sensor
 ---
 
 <img src='/images/supported_brands/appointment-new.png' class='brand pull-right' />

source/_components/sensor.systemmonitor.markdown

@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Sensor
 ---
 
 <img src='/images/supported_brands/utilities-system-monitor.png' class='brand pull-right' />

source/_components/sensor.tellstick.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: telldus_tellstick.png
+ha_category: Sensor
 ---
 
 <img src='/images/supported_brands/telldus_tellstick.png' class='brand pull-right' />

source/_components/sensor.temper.markdown

@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Sensor
 ---
 
 This temper sensor platform allows you to get the current temperature from a TEMPer device.

source/_components/sensor.time_date.markdown

@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Sensor
 ---
 
 <img src='/images/supported_brands/clock.png' class='brand pull-right' />

source/_components/sensor.transmission.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: transmission.png
+ha_category: Sensor
 ---
 
 <img src='/images/supported_brands/transmission.png' class='brand pull-right' />

source/_components/sensor.vera.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: vera.png
+ha_category: Sensor
 ---
 
 <img src='/images/supported_brands/vera.png' class='brand pull-right' />

source/_components/sensor.wink.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: wink.png
+ha_category: Sensor
 ---
 
 <img src='/images/supported_brands/wink.png' class='brand pull-right' />

source/_components/sensor.worldclock.markdown

@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Sensor
 ---
 
 <img src='/images/supported_brands/clock.png' class='brand pull-right' />

source/_components/shell_command.markdown

@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Other
 ---
 
 <img src='/images/supported_brands/utilities-terminal.png' class='brand pull-right' />

source/_components/sun.markdown

@@ -7,6 +7,7 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+ha_category: Weather
 ---
 
 <img src='/images/supported_brands/weather-clear.png' class='brand pull-right' />

source/_components/switch.arduino.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: arduino.png
+ha_category: Switch
 ---
 
 <img src='/images/supported_brands/arduino.png' class='brand pull-right' />

source/_components/switch.arest.markdown

@@ -7,6 +7,8 @@ sidebar: false
 comments: false
 sharing: true
 footer: true
+logo: arest.png
+ha_category: Switch
 ---
 
 <img src='/images/supported_brands/arest.png' class='brand pull-right' />