Removed all old code. Fixes #18
Removed old code. Fixes #18
Merge branch 'devel' of github.com:norberhuis/tribler into devel