New pymdht pointer
fix small/big icon
Merge pull request #474 from Tribler/destroy_swifttracker

Improved Prefetching
No more oneswarm java files
Merge pull request #475 from LipuFei/fix-icon

fix small/big icon
Merge pull request #476 from NielsZeilemaker/remove_java

No more oneswarm java files
Give worker threads more time to shutdown
Startup.
First implementation of metadata community.
Integrate metadata into Tribler.
Add metadata callback for RSS parser.
Update RSS parser.
Small cleanup for Swift; remove debug dispersy endpoint.
Remove dependency on lxml.
Integrate metadata into Tribler.
rebase fix
Merge remote-tracking branch 'upstream/devel' into videoserver_cleanup

Conflicts:
	Tribler/Core/APIImplementation/UserCallbackHandler.py
	Tribler/Main/tribler_main.py
	Tribler/Main/vwxGUI/EmbeddedPlayer.py
	Tribler/Test/API/test_vod.py
	Tribler/Video/VideoPlayer.py
Fix imports
Fix
Back to crazy imports