chrome extension
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	chrome-extension/httpwatcher/background.js
	chrome-extension/httpwatcher/manager.html
	chrome-extension/httpwatcher/manager.js
	chrome-extension/httpwatcher/manifest.json
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/src/test/java/com/meteorite/core/parser/http/JSoupParserTest.java
chrome extension