Removed dist files
Make inactivity timeout configurable
Fix issue with minified version
Allow per-player setting of inactivityTimeout
Merge branch 'stable'

Conflicts:
	dist/video-js/video-js.css
	dist/video-js/video-js.min.css
	dist/video-js/video-js.swf
	dist/video-js/video.dev.js
	dist/video-js/video.js
Allow disabling of inactivity timeout
Fix typo in video tracks documentation

small typo
german Translation based on es.json
fixing techGet for HTML5 src method
Add test for manual time tracking and dispose
Make sure time and progress event synthesis is turned off after the tech is disposed.For #1431.
Merge pull request #1422 from SunnyLi/patch-1

Fix typo in video tracks documentation
Merge branch 'stable'

Conflicts:
	dist/video-js/video-js.css
	dist/video-js/video-js.min.css
	dist/video-js/video.dev.js
	dist/video-js/video.js
Add simple inactivityTimeout test
Add test cases for default and disabled timeout
Switch to sinon fake timers
Ignore null, undefined, and NaN is dimension()
Add vjs.isNaN to have a better cross browser isNaN checker.
Previously, only undefined was ignored, so, it tried setting the
dimension using null and NaN as values. In most browsers this isn't a
problem, but in particular on IE8, things break.
With this PR, all three of those values will be ignored.
Bind 'onKeyPress' during keydown instead of keyup.

Binding during keydown will be more effective at preventing certain default behavior like moving the page down as these events may happen prior to keyup. Addresses #1452
Merge pull request #1426 from andekande/germantranslation

german Translation based on es.json
Added line to the changelog for #1426
Merge branch 'html5-src-fix' of github.com:guardian/video.js into guardian-html5-src-fix