- Don't display UPnP info on peers page in Android
  to prevent crash
merge of '4eee3780cfb882747ad68e39ac08b721f91c48a7'
     and 'cca89ae05036ab7a2fe0080fdd1cfac19968246a'
sfv mime type
more transport categories
reduce same-country bonus, less countries