Fixed unittests
TUPT Control now parses websites
Merge branch 'devel' of github.com:norberhuis/tribler into devel

Conflicts:
	Tribler/TUPT/ListCtrlComboPopup.py
	Tribler/TUPT/TUPTControl.py
Merge branch 'devel' of github.com:norberhuis/tribler into devel
TUPTControl now correctly displays infobar.
Merge branch 'devel' of github.com:norberhuis/tribler into devel