Merge branch 'master' of https://github.com/mozilla/pdf.js

Fixed conflicts:
	web/viewer.css
Address @Snuffleupagus and @mduan comments.