Merge branch 'master' of https://github.com/camporez/tpb2rss

Conflicts:
	openshift/page/tpb2rss.html
	openshift/wsgi.py
Merge branch 'master' of https://github.com/camporez/tpb2rss

Conflicts:
	openshift/page/tpb2rss.html
	openshift/wsgi.py