test
Merge branch 'master' of https://github.com/bluewings/web-clipper

Conflicts:
	chrome-ext/web-clipper/manifest.json
	views/template.widget.jade