Fixes XRays regression at ShumwayStreamConverter
Merge commit '2717b0c'
Replace README.md typo with clearer install call-to-action
Merge remote-tracking branch 'mozilla/nat'

Conflicts:
	extension/firefox/content/ShumwayStreamConverter.jsm
Adds 'grunt web' command
Merge pull request #1520 from yurydelendik/master

'nat' branch merge
Fixes 'display3D' case in the playerglobal manifest
Make sure clip values are getting updated
Fixes iframe viewer relation paths in relation to web deployments
Avoids double bundles building
Trying to fix travis
Fixes iframe viewer for AVM1 swfs
Replaces "window.print" in the iframe viewer
Merge pull request #1521 from mbebenita/avx

Some perf updates.
Update makefile.