build uproxy firefox
Merge branch 'dev' of https://github.com/uProxy/uproxy into uproxy-firefox
small README fixes
change model.network to be an array instead of an object
fixes polymer issue
Merge branch 'dev' into uproxy-firefox

Conflicts:
	src/generic_ui/scripts/ui.spec.ts
	src/generic_ui/scripts/ui.ts
Merge pull request #397 from uProxy/uproxy-firefox

build uproxy firefox
address daniel's comment and fix uistatic
Merge pull request #431 from uProxy/salomegeo-generic-ui

address daniel's comment and fix uistatic
Merge pull request #426 from uProxy/jetpack-readme_fixes

small README fixes
Removing more dead code from the UI
Re-add icon code, update comment
Merge pull request #434 from uProxy/dborkan-ui

Removing more dead code from the UI
remove unused roster object
remove roster object
Fix search box for friends by name
Merge pull request #438 from uProxy/lucyhe-implement_UI_friend_search

Fix search box for friends by name
Merge pull request #436 from uProxy/salomegeo-generic-ui

remove unused roster object
set monitorIntervalId to be able to stop monitoring
Revert "set monitorIntervalId to be able to stop monitoring"

This reverts commit d2efd55902d9f925a961a760c321e42aff671ef3.
set monitoringIntervalId to be able to stop monitoring