Merge branch 'current' into next

source/_components/sensor.sense.markdown

@@ -0,0 +1,58 @@
+---
+layout: page
+title: Sense
+description: "Instructions on how to integrate Sense within Home Assistant."
+date: 2018-01-11 13:50
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: sense.png
+ha_category: Energy
+ha_iot_class: "Cloud Polling"
+ha_release: 0.65
+---
+
+Integrate your [Sense](https://sense.com) electricity meter information into Home Assistant. 
+
+## {% linkable_title Configuration %}
+
+To enable this integration in your installation, add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+sense:
+  email: CLIENT_ID
+  password: CLIENT_SECRET
+```
+
+In addition to binary sensors for individual devices, two types of sensors will be created with the following names:
+
+- **Active Usage/Production**: Current active power usage/production in Watts. Updated every 1 minute.
+- **Daily/Weekly/Monthly/Yearly Usage/Production**: Daily power usage/production in kWh. Updated every 5 minutes.
+
+{% configuration %}
+email:
+  description: The email associated with your Sense account/application.
+  required: true
+  type: string  
+password:
+  description: The password for your Sense account/application.
+  required: true
+  type: string
+timeout:
+  description: Timeout for the connection in seconds.
+  required: false
+  default: 5
+  type: integer
+{% endconfiguration %}
+
+Full example:
+
+```yaml
+# Example configuration.yaml entry
+sense:
+  email: CLIENT_ID
+  password: CLIENT_SECRET
+  timeout: 5
+```

source/_lovelace/entity-button.markdown

@@ -77,6 +77,7 @@ Title and Script Service Example:
 ```yaml
 - type: entity-button
   name: Turn Off Lights
+  tap_action: call-service
   entity: script.turn_off_lights
   service: script.turn_on
 ```