Merge remote-tracking branch 'origin/master' into next

Conflicts:
	source/_posts/2016-07-16-sqlalchemy-knx-join-simplisafe.markdown

source/getting-started/android.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
-title: "Getting started on Android"
-description: "Android instructions to add Home Assistant to your homescreen."
+title: "Getting started on Mobile"
+description: "Android/iOS instructions to add Home Assistant to your homescreen."
 date: 2015-03-08 21:36
 sidebar: true
 comments: false
@@ -9,7 +9,9 @@ sharing: true
 footer: true
 ---
 
-Home Assistant is not available on the Play Store. Instead, Home Assistant leverages the new [manifest.json support](https://w3c.github.io/manifest/) to allow Android devices to add the web application to your homescreen as if it was a native application.
+Home Assistant is not available on the Play Store or App Store. Instead, Home Assistant leverages the new [manifest.json support](https://w3c.github.io/manifest/) to allow Mobile devices to add the web application to your homescreen as if it was a native application.
+
+On Android:
 
   1. Open Chrome
   2. Navigate to your Home Assistant instance
@@ -20,3 +22,11 @@ Home Assistant is not available on the Play Store. Instead, Home Assistant lever
 <p class='img' style='width:500px; margin-left: auto; margin-right: auto;'>
 <img src='/images/screenshots/android-homescreen-guide.gif' />
 </p>
+
+On iOS:
+
+  1. Open Safari
+  2. Navigate to your Home Assistant instance
+  3. Click on the share icon in the middle of the toolbar (on the bottom)
+  4. Click on Add to Home Screen
+  5. A dialog will popup, click on Add

source/getting-started/basic.markdown

@@ -42,6 +42,10 @@ http:
   api_password: YOUR_PASSWORD
 ```
 
+<p class='note warning'>
+If you are planing to expose your Home Assistant instance to the internet and don't set a password then your installation could be accessed by everybody.
+</p>
+
 See the [HTTP component documentation](/components/http/) for more options like HTTPS encryption.
 
 ### {% linkable_title Setting up your phone or tablet %}

source/getting-started/browsers.markdown

@@ -59,7 +59,8 @@ We would appreciate if you help to keep this page up-to-date and add feedback.
 
 | Browser               | Release        | State      | Comments                 |
 | :-------------------- |:---------------|:-----------|:-------------------------|
-| [Safari]              |                | unknown    |                          |
+| [Safari]              |                | works      | Can also be added to desktop |
+| [Chrome]              |                | works      |                          |
 
 
 [Firefox]: https://www.mozilla.org/en-US/firefox/

source/getting-started/installation-raspberry-pi-all-in-one.markdown

@@ -62,6 +62,12 @@ To upgrade with fabric:
 *  Login to Raspberry Pi `ssh pi@your_raspberry_pi_ip`
 *  Change to `cd ~/fabric-home-assistant`
 *  Run `fab upgrade_homeassistant`
+  
+After upgrading, you can restart Home Assistant a few different ways:
+
+* Restarting the Raspberry Pi `sudo reboot`
+* Restarting the Home-Assistant Service `sudo systemctl restart home-assistant.service`
+
 
 ### {% linkable_title Using the OZWCP web application %}
 

source/getting-started/z-wave.markdown

@@ -15,7 +15,7 @@ There is currently support for switches, lights and sensors. All will be picked
 
 ### {% linkable_title Installation %}
 
-To allow Home Assistant to talk to your Z-Wave USB stick you will have to compile the OpenZWave library and install the related [python-OpenZWave package](https://github.com/OpenZWave/python-openzwave). This can be done as follows. _(Note: The Home Assistant docker image has support for Z-Wave built-in)_
+To allow Home Assistant to talk to your Z-Wave USB stick you will have to compile the OpenZWave library and install the related [python-OpenZWave package](https://github.com/OpenZWave/python-openzwave). This can be done as follows. _(Note: The Home Assistant docker image and the All In One installer have support for Z-Wave already built-in!)_
 
 Make sure you have the correct dependencies installed before running the script: