Merge branch 'master' into tribler-downloadmanager

Conflicts:
    tribler-prototype/tsap/service/Environment.py