removed retries column in Torrent table; updated DB upgrade; added junk tracker filtering.
Merge branch 'issue296-2' of github.com:lfei815/tribler into issue296-2