Baselines Update
Merge branch 'master' of https://github.com/thejosh223/cs198mojo

Conflicts:
	TriblerCode/Tribler/Core/APIImplementation/DownloadImpl.py
	TriblerCode/Tribler/Core/BitTornado/download_bt1.py
	TriblerCode/ejbc.mpegts.tstream
Fix Head