Merge branch 'fixes' into 'master'

Doc/SRS/SRS-Rev0.pdf

Doc/SRS/SRS-Rev0.tex

src/manifest.json

src/src/browser_action/browser_action.html

src/src/browser_action/js/browser_action.js

src/src/module/demo/aes.js

src/src/module/demo/demo.html

src/src/module/demo/scrypt.js

src/src/module/demo/sha.js

src/src/module/dist/bundle.js

src/src/module/index.js

src/src/module/unicode.js

src/src/options/js/options.js

src/src/options/options.html