Merge branch 'master' into cover_thumbnail

# Conflicts:
#	cps/db.py
#	cps/templates/author.html
#	cps/templates/discover.html
#	cps/templates/index.html
#	cps/templates/search.html
#	cps/templates/shelf.html
#	cps/web.py
#	requirements.txt
#	test/Calibre-Web TestSummary_Linux.html

cps.py

@@ -16,11 +16,6 @@
 #
 #  You should have received a copy of the GNU General Public License
 #  along with this program. If not, see <http://www.gnu.org/licenses/>.
-try:
-    from gevent import monkey
-    monkey.patch_all()
-except ImportError:
-    pass
 
 import sys
 import os