Merging
Merge branch 'master' of https://github.com/CyclopsTeam/TheTorrentSystem

Conflicts:
	TorrentSite/App_Data/TorrentSite.mdf
	TorrentSite/App_Data/TorrentSite_log.ldf