Merge branch 'master' into dev

src/src/browser_action/browser_action.html

src/src/browser_action/css/browser_action.css

src/src/browser_action/js/browser_action.js

src/src/module/dist/bundle.js

src/src/module/index.js

src/src/options/js/options.js

src/src/options/options.html