using active transfers in speed monitor
Merge branch 'develop' into active-transfers

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
using active transfers in several places
Merge branch 'active-transfers' into develop

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
#31 use emule client hash
ed2k port forwarding
Merge branch 'master' into develop
Merge branch 'develop'