diff --git a/atom.xml b/atom.xml
index 94f4e94d0e..7391453784 100644
--- a/atom.xml
+++ b/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Home Assistant]]></title>
   <link href="https://home-assistant.io/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-06-18T23:18:02+00:00</updated>
+  <updated>2016-06-18T23:38:46+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
@@ -49,6 +49,8 @@
   <li>Component <a href="https://home-assistant.io/components/shell_command/">shell command</a> can now use templates to render arguments (<a href="https://github.com/partofthething/">@partofthething</a>)</li>
   <li>Rollershutter: <a href="https://home-assistant.io/components/rollershutter.wink/">Wink</a> is now supported (<a href="https://github.com/philk/">@philk</a>)</li>
   <li>Alexa: Updated <a href="https://home-assistant.io/components/alexa/#working-with-scenes/">documentation</a> to show how to call scripts and scenes (@acockburn)</li>
+  <li>Sensor: <a href="https://home-assistant.io/components/sensor.snmp/">SNMP</a> is now supported (<a href="https://github.com/fabaff/">@fabaff</a>)</li>
+  <li>Sensor: Support for Swiss hydrological data (<a href="https://github.com/fabaff/">@fabaff</a>)</li>
 </ul>
 
 ]]></content>
diff --git a/blog/2016/06/18/pandora-bt-home-hub-5-and-local-file-camera/index.html b/blog/2016/06/18/pandora-bt-home-hub-5-and-local-file-camera/index.html
index 7410dc6bf7..d80378d766 100644
--- a/blog/2016/06/18/pandora-bt-home-hub-5-and-local-file-camera/index.html
+++ b/blog/2016/06/18/pandora-bt-home-hub-5-and-local-file-camera/index.html
@@ -139,6 +139,8 @@
   <li>Component <a href="/components/shell_command/">shell command</a> can now use templates to render arguments (<a href="https://github.com/partofthething/">@partofthething</a>)</li>
   <li>Rollershutter: <a href="/components/rollershutter.wink/">Wink</a> is now supported (<a href="https://github.com/philk/">@philk</a>)</li>
   <li>Alexa: Updated <a href="/components/alexa/#working-with-scenes">documentation</a> to show how to call scripts and scenes (@acockburn)</li>
+  <li>Sensor: <a href="/components/sensor.snmp/">SNMP</a> is now supported (<a href="https://github.com/fabaff/">@fabaff</a>)</li>
+  <li>Sensor: Support for Swiss hydrological data (<a href="https://github.com/fabaff/">@fabaff</a>)</li>
 </ul>
 </article>
 
diff --git a/blog/categories/community/atom.xml b/blog/categories/community/atom.xml
index 838ae2b094..abd967fe03 100644
--- a/blog/categories/community/atom.xml
+++ b/blog/categories/community/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Community | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/community/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-06-18T23:18:02+00:00</updated>
+  <updated>2016-06-18T23:38:46+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/device-tracking/atom.xml b/blog/categories/device-tracking/atom.xml
index a5d9cf8cd1..7c0dc0e9ef 100644
--- a/blog/categories/device-tracking/atom.xml
+++ b/blog/categories/device-tracking/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Device-Tracking | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/device-tracking/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-06-18T23:18:02+00:00</updated>
+  <updated>2016-06-18T23:38:46+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/esp8266/atom.xml b/blog/categories/esp8266/atom.xml
index 7065fb8292..c3ae3a0414 100644
--- a/blog/categories/esp8266/atom.xml
+++ b/blog/categories/esp8266/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: ESP8266 | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/esp8266/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-06-18T23:18:02+00:00</updated>
+  <updated>2016-06-18T23:38:46+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/how-to/atom.xml b/blog/categories/how-to/atom.xml
index 9e7a3ab301..2b9f44f4b8 100644
--- a/blog/categories/how-to/atom.xml
+++ b/blog/categories/how-to/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: How-To | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/how-to/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-06-18T23:18:02+00:00</updated>
+  <updated>2016-06-18T23:38:46+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/ibeacons/atom.xml b/blog/categories/ibeacons/atom.xml
index 40c921fc4e..9c6a551883 100644
--- a/blog/categories/ibeacons/atom.xml
+++ b/blog/categories/ibeacons/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: iBeacons | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/ibeacons/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-06-18T23:18:02+00:00</updated>
+  <updated>2016-06-18T23:38:46+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/internet-of-things/atom.xml b/blog/categories/internet-of-things/atom.xml
index 90f3592883..4eebd75781 100644
--- a/blog/categories/internet-of-things/atom.xml
+++ b/blog/categories/internet-of-things/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Internet-of-Things | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/internet-of-things/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-06-18T23:18:02+00:00</updated>
+  <updated>2016-06-18T23:38:46+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/mqtt/atom.xml b/blog/categories/mqtt/atom.xml
index f635e286ce..2e7233ec4c 100644
--- a/blog/categories/mqtt/atom.xml
+++ b/blog/categories/mqtt/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: MQTT | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/mqtt/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-06-18T23:18:02+00:00</updated>
+  <updated>2016-06-18T23:38:46+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/organisation/atom.xml b/blog/categories/organisation/atom.xml
index 9668c69b9e..8fbfd11c2c 100644
--- a/blog/categories/organisation/atom.xml
+++ b/blog/categories/organisation/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Organisation | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/organisation/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-06-18T23:18:02+00:00</updated>
+  <updated>2016-06-18T23:38:46+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/owntracks/atom.xml b/blog/categories/owntracks/atom.xml
index 9266deb33a..a4bfe7d522 100644
--- a/blog/categories/owntracks/atom.xml
+++ b/blog/categories/owntracks/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: OwnTracks | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/owntracks/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-06-18T23:18:02+00:00</updated>
+  <updated>2016-06-18T23:38:46+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/presence-detection/atom.xml b/blog/categories/presence-detection/atom.xml
index ac170c14fd..9e1bdae0bc 100644
--- a/blog/categories/presence-detection/atom.xml
+++ b/blog/categories/presence-detection/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Presence-Detection | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/presence-detection/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-06-18T23:18:02+00:00</updated>
+  <updated>2016-06-18T23:38:46+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/public-service-announcement/atom.xml b/blog/categories/public-service-announcement/atom.xml
index 9721049c3e..2be70c01d7 100644
--- a/blog/categories/public-service-announcement/atom.xml
+++ b/blog/categories/public-service-announcement/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Public-Service-Announcement | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/public-service-announcement/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-06-18T23:18:02+00:00</updated>
+  <updated>2016-06-18T23:38:46+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/release-notes/atom.xml b/blog/categories/release-notes/atom.xml
index 99b38d1c0c..c7d09d7ca3 100644
--- a/blog/categories/release-notes/atom.xml
+++ b/blog/categories/release-notes/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Release-Notes | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/release-notes/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-06-18T23:18:02+00:00</updated>
+  <updated>2016-06-18T23:38:46+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
@@ -49,6 +49,8 @@
   <li>Component <a href="/components/shell_command/">shell command</a> can now use templates to render arguments (<a href="https://github.com/partofthething/">@partofthething</a>)</li>
   <li>Rollershutter: <a href="/components/rollershutter.wink/">Wink</a> is now supported (<a href="https://github.com/philk/">@philk</a>)</li>
   <li>Alexa: Updated <a href="/components/alexa/#working-with-scenes">documentation</a> to show how to call scripts and scenes (@acockburn)</li>
+  <li>Sensor: <a href="/components/sensor.snmp/">SNMP</a> is now supported (<a href="https://github.com/fabaff/">@fabaff</a>)</li>
+  <li>Sensor: Support for Swiss hydrological data (<a href="https://github.com/fabaff/">@fabaff</a>)</li>
 </ul>
 
 ]]></content>
diff --git a/blog/categories/survey/atom.xml b/blog/categories/survey/atom.xml
index 60c9c463ed..136cf43d61 100644
--- a/blog/categories/survey/atom.xml
+++ b/blog/categories/survey/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Survey | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/survey/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-06-18T23:18:02+00:00</updated>
+  <updated>2016-06-18T23:38:46+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/talks/atom.xml b/blog/categories/talks/atom.xml
index 0f26d062ba..f94d8938f5 100644
--- a/blog/categories/talks/atom.xml
+++ b/blog/categories/talks/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Talks | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/talks/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-06-18T23:18:02+00:00</updated>
+  <updated>2016-06-18T23:38:46+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/technology/atom.xml b/blog/categories/technology/atom.xml
index 6db43eb594..c8801122e9 100644
--- a/blog/categories/technology/atom.xml
+++ b/blog/categories/technology/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Technology | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/technology/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-06-18T23:18:02+00:00</updated>
+  <updated>2016-06-18T23:38:46+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/user-stories/atom.xml b/blog/categories/user-stories/atom.xml
index 3ade3b015f..375853b765 100644
--- a/blog/categories/user-stories/atom.xml
+++ b/blog/categories/user-stories/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: User-Stories | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/user-stories/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-06-18T23:18:02+00:00</updated>
+  <updated>2016-06-18T23:38:46+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/video/atom.xml b/blog/categories/video/atom.xml
index b6beb2e3de..82a426296b 100644
--- a/blog/categories/video/atom.xml
+++ b/blog/categories/video/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Video | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/video/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-06-18T23:18:02+00:00</updated>
+  <updated>2016-06-18T23:38:46+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/categories/website/atom.xml b/blog/categories/website/atom.xml
index 99f3c9a905..4ebad4a9be 100644
--- a/blog/categories/website/atom.xml
+++ b/blog/categories/website/atom.xml
@@ -4,7 +4,7 @@
   <title><![CDATA[Category: Website | Home Assistant]]></title>
   <link href="https://home-assistant.io/blog/categories/website/atom.xml" rel="self"/>
   <link href="https://home-assistant.io/"/>
-  <updated>2016-06-18T23:18:02+00:00</updated>
+  <updated>2016-06-18T23:38:46+00:00</updated>
   <id>https://home-assistant.io/</id>
   <author>
     <name><![CDATA[Paulus Schoutsen]]></name>
diff --git a/blog/index.html b/blog/index.html
index 494f3298de..a094736467 100644
--- a/blog/index.html
+++ b/blog/index.html
@@ -143,6 +143,8 @@
   <li>Component <a href="/components/shell_command/">shell command</a> can now use templates to render arguments (<a href="https://github.com/partofthething/">@partofthething</a>)</li>
   <li>Rollershutter: <a href="/components/rollershutter.wink/">Wink</a> is now supported (<a href="https://github.com/philk/">@philk</a>)</li>
   <li>Alexa: Updated <a href="/components/alexa/#working-with-scenes">documentation</a> to show how to call scripts and scenes (@acockburn)</li>
+  <li>Sensor: <a href="/components/sensor.snmp/">SNMP</a> is now supported (<a href="https://github.com/fabaff/">@fabaff</a>)</li>
+  <li>Sensor: Support for Swiss hydrological data (<a href="https://github.com/fabaff/">@fabaff</a>)</li>
 </ul>
 
 
diff --git a/components/camera.netatmo/index.html b/components/camera.netatmo/index.html
index 41201abdde..9fe054aef1 100644
--- a/components/camera.netatmo/index.html
+++ b/components/camera.netatmo/index.html
@@ -136,7 +136,7 @@
       <img src='/images/supported_brands/netatmo.png' />
   </div>
     <div class='section'>
-    Introduced in release: 0.2x
+    Introduced in release: 0.22
     </div>
     <div class='section'>
       This is a platform for
diff --git a/developers/credits/index.html b/developers/credits/index.html
index 4726411634..77323451da 100644
--- a/developers/credits/index.html
+++ b/developers/credits/index.html
@@ -103,8 +103,8 @@
 
 <ul>
   <li><a href="https://github.com/adrienbrault">Adrien Brault</a></li>
-  <li><a href="https://github.com/infamy">Alex Harvey</a></li>
   <li><a href="https://github.com/shaftoe">Alexander Fortin</a></li>
+  <li><a href="https://github.com/infamy">Alex Harvey</a></li>
   <li><a href="https://github.com/allanglen">Allan Glen</a></li>
   <li><a href="https://github.com/fignuts">amorsillo</a></li>
   <li><a href="https://github.com/aoakeson">Andrew</a></li>
@@ -112,6 +112,7 @@
   <li><a href="https://github.com/andylockran">Andy Loughran</a></li>
   <li><a href="https://github.com/andythigpen">andythigpen</a></li>
   <li><a href="https://github.com/omgapuppy">Ardi Mehist</a></li>
+  <li><a href="https://github.com/arsaboo/">arsaboo</a></li>
   <li><a href="https://github.com/leoc">Arthur Leonard Andersen</a></li>
   <li><a href="https://github.com/trainman419">Austin</a></li>
   <li><a href="https://github.com/Azelphur">Azelphur</a></li>
@@ -130,6 +131,7 @@
   <li><a href="https://github.com/danielhiversen">Daniel Iversen</a></li>
   <li><a href="https://github.com/danieljkemp/">Daniel J. Kemp</a></li>
   <li><a href="https://github.com/kk7ds">Dan Smith</a></li>
+  <li><a href="https://github.com/dansullivan86/">Dan Sullivan</a></li>
   <li><a href="https://github.com/Xorso">Daren Lord</a></li>
   <li><a href="https://github.com/FreekingDean">Dean Galvin</a></li>
   <li><a href="https://github.com/TheRealLink">Dennis Karpienski</a></li>
@@ -160,6 +162,7 @@
   <li><a href="https://github.com/jaharkes">Jan Harkes</a></li>
   <li><a href="https://github.com/jpmossin">Jan-Preben Mossin</a></li>
   <li><a href="https://github.com/DesignFirst">Jaret Stezelberger</a></li>
+  <li><a href="https://github.com/linjef/">Jeffrey Lin</a></li>
   <li><a href="https://github.com/Qrtn">Jeffrey Tang</a></li>
   <li><a href="https://github.com/SEJeff">Jeff Schroeder</a></li>
   <li><a href="https://github.com/joelash">Joel Asher Friedman</a></li>
@@ -179,6 +182,7 @@
   <li><a href="https://github.com/kennedyshead">kennedyshead</a></li>
   <li><a href="https://github.com/kixam">kixam</a></li>
   <li><a href="https://github.com/kylehendricks">Kyle Hendricks</a></li>
+  <li><a href="https://github.com/lwis/">Lewis Juggins</a></li>
   <li><a href="https://github.com/LucaSoldi">Luca Soldi</a></li>
   <li><a href="https://github.com/lukas-hetzenecker">Lukas Hetzenecker</a></li>
   <li><a href="https://github.com/MagnusKnutas">Magnus Knutas</a></li>
@@ -189,6 +193,7 @@
   <li><a href="https://github.com/fingon">Markus Stenberg</a></li>
   <li><a href="https://github.com/MartinHjelmare">Martin Hjelmare</a></li>
   <li><a href="https://github.com/t30">Matteo Lampugnani</a></li>
+  <li><a href="https://github.com/mtreinish/">Matthew Treinish</a></li>
   <li><a href="https://github.com/michaelarnauts">Michael Arnauts</a></li>
   <li><a href="https://github.com/auchter">Michael Auchter</a></li>
   <li><a href="https://github.com/Zyell">Michael Gilbert</a></li>
diff --git a/sitemap.xml b/sitemap.xml
index 1c6db805f0..9335b6b103 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -1797,26 +1797,26 @@
     </url>
   <url>
     <loc>https://home-assistant.io/demo/frontend.html</loc>
-    <lastmod>2016-06-18T23:17:18+00:00</lastmod>
+    <lastmod>2016-06-18T23:38:11+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/demo/index.html</loc>
-    <lastmod>2016-06-18T23:17:18+00:00</lastmod>
+    <lastmod>2016-06-18T23:38:11+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/googlef4f3693c209fe788.html</loc>
-    <lastmod>2016-06-18T23:17:18+00:00</lastmod>
+    <lastmod>2016-06-18T23:38:11+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/static/fonts/roboto/DESCRIPTION.en_us.html</loc>
-    <lastmod>2016-06-18T23:17:18+00:00</lastmod>
+    <lastmod>2016-06-18T23:38:11+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/static/fonts/robotomono/DESCRIPTION.en_us.html</loc>
-    <lastmod>2016-06-18T23:17:18+00:00</lastmod>
+    <lastmod>2016-06-18T23:38:11+00:00</lastmod>
   </url>
   <url>
     <loc>https://home-assistant.io/static/mdi-demo.html</loc>
-    <lastmod>2016-06-18T23:17:18+00:00</lastmod>
+    <lastmod>2016-06-18T23:38:11+00:00</lastmod>
   </url>
 </urlset>