Merge branch 'master' into tracker

diff --cc www/webapp/__init__.py
Simple merge

diff --cc www/webapp/handlers.py
index 53d47ede8c128c737ab53abc8d31f9977a96c2a3,95de62c65981578b429446324feb697f7621062f..636e0a8be809d0496c8d2f1a83939f80cdcf83b1
--- 1/www/webapp/handlers.py
--- 2/www/webapp/handlers.py
+++ b/www/webapp/handlers.py
@@@ -21,12 -21,9 +21,10 @@@ from info import inf
  from mirrors import mirrors
  from news import news
  from releases import releases
 +from torrent import tracker, bencode, bdecode, decode_hex
  
  import builds
- import cluster
  import menu
- import translations
  #import uriel
  
  class BaseHandler(tornado.web.RequestHandler):