Merge branch 'devel' of github.com:Tribler/tribler into devel

Conflicts:
	.gitignore
	Tribler/Core/APIImplementation/LaunchManyCore.py
	Tribler/Core/RawServer/RawServer.py
	Tribler/Core/RawServer/SocketHandler.py
	Tribler/Core/ServerPortHandler.py
	Tribler/Core/Swift/SwiftProcess.py
	Tribler/Main/tribler.py
	Tribler/Main/tribler_main.py
	Tribler/Main/vwxGUI/home.py
	Tribler/Main/vwxGUI/list.py
	Tribler/Main/vwxGUI/widgets.py
	Tribler/SwiftEngine
	Tribler/dispersy
annotations