Fix for swift_reseed folder not respecting default_dest_dir
Merge pull request #128 from NielsZeilemaker/devel

Fix for swift_reseed folder not respecting default_dest_dir
Fix for create channel
Don't display 'From' label for SelectedChannelList
Merge pull request #132 from egbertbouman/devel

Fix for create channel + don't display 'From' label for SelectedChannelList
Merge remote-tracking branch 'remotes/upstream/devel' into livebartercast

Conflicts:
	Tribler/Core/Swift/SwiftDownloadImpl.py