update mechanism

localmode by default
reduce some if statements in genRules process
update mechanism

fix bug in capturing Proxy IP.(add fromCache judgment)
update mechanism

fix bug
bugging
Revert "bugging"

This reverts commit 7cb0f3830805cd67e1c1cee5cf18cca836b89411.
Revert "update mechanism"

This reverts commit 6d57643f4b28ae5d85de8787115fea04329796a9.
Revert "update mechanism"

This reverts commit 911c9d0b5254826892ca789bf0d2310a5a75af23.
update mechanism

fix bug in capturing Proxy IP.(add fromCache judgment)
Merge remote-tracking branch 'upstream/Dev'

Conflicts:
	js/background.js