Merge branch 'master' into develop

# Conflicts:
#	dev/restart.sh
#	doc/_includes/footer.html

Author: JanPetr

README.md

@@ -7,7 +7,7 @@ This extension replaces the default search of Magento with a typo-tolerant, fast
 
 See features and benefits of [Algolia Search Extension for Magento](https://community.algolia.com/magento).
 
-![Latest version](https://img.shields.io/badge/latest-1.5.4-green.svg)
+![Latest version](https://img.shields.io/badge/latest-1.6.0-green.svg)
 ![Magento 1.6.2](https://img.shields.io/badge/magento-1.6.2-blue.svg)
 ![Magento 1.7.1](https://img.shields.io/badge/magento-1.7.1-blue.svg)
 ![Magento 1.8.1](https://img.shields.io/badge/magento-1.8.1-blue.svg)

dev/restart.sh

@@ -15,7 +15,7 @@ cd `dirname "$0"`
 
 usage() {
   echo "Usage:" >&2
-  echo "$PROG -a APPLICATION_ID -k API_KEY -s SEARCH_ONLY_API_KEY [-p INDEX_PREFIX] [-b BASE_URL] [-o EXPOSED_PORT] [-v MAGENTO_VERSION]" >&2
+  echo "$PROG -a APPLICATION_ID -k API_KEY -s SEARCH_ONLY_API_KEY [-p INDEX_PREFIX] [-b BASE_URL] [-o EXPOSED_PORT] [-v MAGENTO_VERSION] [--no-algolia] [--release]" >&2
   echo "" >&2
   echo "Options:" >&2
   echo "   -a | --application-id               The application ID" >&2
@@ -102,6 +102,7 @@ ensure "-a" "$APPLICATION_ID"
 ensure "-k" "$API_KEY"
 ensure "-s" "$SEARCH_ONLY_API_KEY"
 ensure "-b" "$BASE_URL"
+ensure "-o" "$EXPOSED_PORT"
 
 case "$MAGENTO_VERSION" in
   19)

doc/README.md

@@ -0,0 +1,24 @@
+Magento Community Website
+==========================
+
+This is the source code of the https://community.algolia.com/magento/ website. It's based on [Jekyll](http://jekyllrb.com/).
+
+# Development
+
+To run the website locally, you can do:
+
+```sh
+$ cd doc/
+$ bundle install
+$ bundle exec guard
+$ open http://localhost:4000/magento/
+```
+
+# Deployment
+
+We use gh-pages to host the built version of this website. To release it, use the following script:
+
+```sh
+$ cd doc/
+$ make release
+```