Merge branch 'master' into tinydb

# Conflicts:
#	index.py
#	requirements.txt

diff --cc requirements.txt
index f240b88,063a61f..0d250e5
--- 1/requirements.txt
--- 2/requirements.txt
+++ b/requirements.txt
@@@ -1,7 -1,5 +1,4 @@@
- backports-abc==0.5
- backports.ssl-match-hostname==3.5.0.1
- certifi==2016.9.26
- singledispatch==3.4.0.3
- six==1.10.0
+ gunicorn==19.6.0
  tinydb==3.2.1
  tornado==4.4.2
 -pymongo==3.4.0
+ gunicorn==19.6.0