Closes #110
Merge branch 'devel' of github.com:norberhuis/tribler into devel