cosmetic
Merge branch 'master' into deploy
Merge branch 'request' into deploy

Conflicts:
	src/request/backends/allocine_showtimes_zip.php
	src/request/fetch.py
	src/request/test.py
Merge branch 'deploy' of github.com:lutcheti/webtext into deploy