Hotfix for channel refactor mistake
Added activitydiagrams.
Fixed bad indentation level in MovieChannelControl
Fixed IMDbMatcher unit test (and class)
Bugfixes.
updated documentation.
Merge branch 'devel' of github.com:norberhuis/tribler into devel
Closes #150.
Fixed bug in test torrentfinder control
Refactored TUPT Webbrowser to pieces, part of #151
Merge branch 'devel' of github.com:norberhuis/tribler into devel
Updated readme with build instructions, closes #148
Inherit screenscrape plugin
Refactoring based on pylint warnings.
Fixed inheritence calling error, closes #154
Refactoring based on pylint warnings.
Merge branch 'pylintRefactoring' of github.com:norberhuis/tribler into pylintRefactoring

Conflicts:
	Tribler/Main/vwxGUI/webbrowser.py
Merge pull request #156 from norberhuis/RefactorITorrentFinderPlugin

Refactor i torrent finder plugin
Added pylint refactorings.
Fixed crash related to refreshing a wx Window class in a thread, part of fix for #153