Fixed crash related to refreshing a wx Window class in a thread, part of fix for #153
Merge branch 'devel' into wxRefreshCollapseFix
Merge branch 'devel' of github.com:norberhuis/tribler into devel

Conflicts:
	Tribler/Main/vwxGUI/webbrowser.py