diff --git a/_deploy b/_deploy
index 853a81fe69b..aaa26e2e2bd 160000
--- a/_deploy
+++ b/_deploy
@@ -1 +1 @@
-Subproject commit 853a81fe69bcc1acff5492e200a6ab9944b86af2
+Subproject commit aaa26e2e2bd352fcb015330314ea9176292f5c80
diff --git a/source/_includes/custom/navigation.html b/source/_includes/custom/navigation.html
index 5e0ca259357..06d049a284e 100644
--- a/source/_includes/custom/navigation.html
+++ b/source/_includes/custom/navigation.html
@@ -24,5 +24,5 @@
Blog
- Need help?
+ Need help?
diff --git a/source/_posts/2015-07-11-ip-cameras-arduino-kodi-efergy-support.markdown b/source/_posts/2015-07-11-ip-cameras-arduino-kodi-efergy-support.markdown
new file mode 100644
index 00000000000..d01fd2816d9
--- /dev/null
+++ b/source/_posts/2015-07-11-ip-cameras-arduino-kodi-efergy-support.markdown
@@ -0,0 +1,129 @@
+---
+layout: post
+title: "IP Cameras, Arduinos, Kodi and Efergy Energy Monitors now supported"
+description: "New support for IP Cameras, Arduinos, Kodi and Efergy monitors"
+date: 2015-07-11 01:37 -0700
+date_formatted: "July 11, 2015"
+comments: true
+categories: release-notes
+---
+
+Another month has passed and some great new features have landed in Home Assistant. This month release has been made possible by [balloob](https://github.com/balloob), [ettisan](https://github.com/ettisan), [fabaff](https://github.com/fabaff), [gyran](https://github.com/gyran), [jamespcole](https://github.com/jamespcole), [michaelarnauts](https://github.com/michaelarnauts), [miniconfig](https://github.com/miniconfig) and [rmkraus](https://github.com/rmkraus).
+
+This release includes some architectural changes by me. The first is that the frontend is now based on a [NuclearJS](http://optimizely.github.io/nuclear-js/) JavaScript backend. This has greatly helped to organize and optimize the frontend code. Another change is that Home Assistant will now install dependencies on-demand instead of installing dependencies for all supported devices.
+
+__IP Camera Support__
+James has worked very hard to add support for IP cameras to Home Assistant which is included in this release. The initial release focusses on providing generic IP camera support. This means that any webcam that can exposes a JPEG image via a url can be integrated.
+
+Home Assistant will route the requests to your camera via the server allowing you to expose IP camera's inside your network via the Home Assistant app.
+
+```yaml
+# Example configuration.yaml entry
+camera:
+ platform: generic
+ name: my sample camera
+ username: MY_USERNAME
+ password: MY_PASSWORD
+ still_image_url: http://194.218.96.92/jpg/image.jpg
+```
+
+
+To update to the latest version, run scripts/update
. Please report any issues on GitHub.
+
+
+
+
+__Arduino__
+
+Fabian has contributed support for interfacing with Arduinos. This makes it possible to connect your Arduino via USB and expose pins as sensor data and write to pins via switches. Have a look at [the docs](/components/arduino.markdown) for an extensive guide to get started.
+
+```yaml
+# Example configuration.yaml entry
+switch:
+ platform: arduino
+ pins:
+ 11:
+ name: Fan Office
+ type: digital
+ 12:
+ name: Light Desk
+ type: digital
+
+sensor:
+ platform: arduino
+ pins:
+ 1:
+ name: Door switch
+ type: analog
+ 0:
+ name: Brightness
+ type: analog
+```
+
+__Kodi (XBMC)__
+
+Ettisan has contributed a Kodi (XBMC) platform for the media player component. This allows you to track all the media that you are playing and allow you to control it.
+
+```
+# Example configuration.yaml entry
+media_player:
+ platform: kodi
+ name: Kodi
+ url: http://192.168.0.123/jsonrpc
+ user: kodi
+ password: my_secure_password
+```
+
+__TP-Link__
+
+Michael has added TP-Link support to the device tracker. This allows you to now detect presence if you have a TP-Link router.
+
+```yaml
+# Example configuration.yaml entry
+device_tracker:
+ platform: tplink
+ host: YOUR_ROUTER_IP
+ username: YOUR_ADMIN_USERNAME
+ password: YOUR_ADMIN_PASSWORD
+```
+
+__Efergy energy monitor__
+
+Miniconfig has contributed support for the [Efergy energy meters](https://efergy.com). To get an app token, log in to your efergy account, go to the Settings page, click on App tokens, and click "Add token".
+
+```yaml
+# Example configuration.yaml entry
+sensor:
+ platform: efergy
+ app_token: APP_TOKEN
+ utc_offset: UTC_OFFSET
+ monitored_variables:
+ - type: instant_readings
+ - type: budget
+ - type: cost
+ period: day
+ currency: $
+```
+
+__Forecast.io__
+Fabiann has added support for [Forecast.io](https://forecast.io/) to get weather forecasts for Home Assistant. You need an API key which is free but requires a [registration](https://developer.forecast.io/register). To add Forecast.io to your installation, add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+sensor:
+ platform: forecast
+ api_key: YOUR_APP_KEY
+ monitored_conditions:
+ - summary
+ - precip_type
+ - precip_intensity
+ - temperature
+ - dew_point
+ - wind_speed
+ - wind_bearing
+ - cloud_cover
+ - humidity
+ - pressure
+ - visibility
+ - ozone
+```
diff --git a/source/components/camera.generic.markdown b/source/components/camera.generic.markdown
new file mode 100644
index 00000000000..0ee83747637
--- /dev/null
+++ b/source/components/camera.generic.markdown
@@ -0,0 +1,24 @@
+---
+layout: page
+title: "Generic IP Camera"
+description: "Instructions how to integrate IP cameras within Home Assistant."
+date: 2015-07-11 0:36
+sidebar: false
+comments: false
+sharing: true
+footer: true
+---
+
+This component allows you to integrate any IP camera into Home Assistant. It supports fetching images from a url with optional HTTP authentication.
+
+Home Assistant will serve the images via its server, making it possible to view your IP camera's while outside of your network.
+
+```yaml
+# Example configuration.yaml entry
+camera:
+ platform: generic
+ name: my sample camera
+ username: MY_USERNAME
+ password: MY_PASSWORD
+ still_image_url: http://194.218.96.92/jpg/image.jpg
+```
diff --git a/source/components/index.markdown b/source/components/index.markdown
index 198109b3696..044f764466f 100644
--- a/source/components/index.markdown
+++ b/source/components/index.markdown
@@ -163,6 +163,18 @@ Entities are things that you want to observe within Home Assistant. Support for
Controls your Arduino's digital pins and read from the analog pins. |
+
+  |
+ Efergy Engage hubs |
+ Monitors home energy use as measured by an Efergy engage hub. |
+
+
+
+ |
+ Generic IP cameras |
+ Integrate any IP camera or image url into a camera feed. |
+
+
diff --git a/source/components/sensor.efergy.markdown b/source/components/sensor.efergy.markdown
new file mode 100644
index 00000000000..7886ef0e459
--- /dev/null
+++ b/source/components/sensor.efergy.markdown
@@ -0,0 +1,27 @@
+---
+layout: page
+title: "Efergy support"
+description: "Instructions how to integrate Efergy devices within Home Assistant."
+date: 2015-07-11 0:15
+sidebar: false
+comments: false
+sharing: true
+footer: true
+---
+
+
+Integrate your [Efergy](https://efergy.com) meter information into Home Assistant. To get an app token, log in to your efergy account, go to the Settings page, click on App tokens, and click "Add token".
+
+```yaml
+# Example configuration.yaml entry
+sensor:
+ platform: efergy
+ app_token: APP_TOKEN
+ utc_offset: UTC_OFFSET
+ monitored_variables:
+ - type: instant_readings
+ - type: budget
+ - type: cost
+ period: day
+ currency: $
+```
diff --git a/source/demo/manifest.json b/source/demo/manifest.json
index 69143ce5179..4454a923df9 100644
--- a/source/demo/manifest.json
+++ b/source/demo/manifest.json
@@ -1,7 +1,7 @@
{
"name": "Home Assistant",
"short_name": "Assistant",
- "start_url": "/",
+ "start_url": "/demo/",
"display": "standalone",
"icons": [
{
diff --git a/source/getting-started/index.markdown b/source/getting-started/index.markdown
index d230dd379cb..73494570e26 100644
--- a/source/getting-started/index.markdown
+++ b/source/getting-started/index.markdown
@@ -25,7 +25,6 @@ Installing and running Home Assistant on your local machine is easy. Make sure y
git clone --recursive https://github.com/balloob/home-assistant.git
python3 -m venv home-assistant
cd home-assistant
-python3 -m pip install -r requirements.txt
python3 -m homeassistant --open-ui
```
@@ -79,7 +78,7 @@ curl -L https://raw.githubusercontent.com/yyuu/pyenv-installer/master/bin/pyenv-
```bash
nano ~/.bashrc
```
-
+
Then add these lines to the end of the file and save:
```
export PATH="$HOME/.pyenv/bin:$PATH"
@@ -122,11 +121,6 @@ cd home-assistant
pyenv local homeassistant
```
-Step 6. Finish the install
-```bash
-python3 -m pip install -r requirements.txt
-```
-
Step 7. Start it up
```bash
python3 -m homeassistant
diff --git a/source/help/help.markdown b/source/help/index.markdown
similarity index 100%
rename from source/help/help.markdown
rename to source/help/index.markdown
diff --git a/source/images/supported_brands/efergy.png b/source/images/supported_brands/efergy.png
new file mode 100644
index 00000000000..4d1c1673cde
Binary files /dev/null and b/source/images/supported_brands/efergy.png differ