update model
Merge branch 'dev' of https://github.com/uProxy/uproxy into firefox-contacts
global
Merge pull request #635 from uProxy/firefox-contacts

update model
Merge branch 'dev' of https://github.com/uProxy/uproxy into dborkan-network-refactor

Conflicts:
	src/firefox/data/scripts/background.js