Make inactivity timeout configurable
Fix issue with minified version
Allow per-player setting of inactivityTimeout
Allow disabling of inactivity timeout
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.
Add simple inactivityTimeout test
Add test cases for default and disabled timeout
Switch to sinon fake timers
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
Added a line to the changelog for #1430
Merge branch 'guardian-html5-src-fix'
Merge pull request #1435 from dmlap/test-manual-tracking

Add test for manual time tracking and dispose
Merge branch 'patch-1' of github.com:songpete/video.js into songpete-patch-1
Merge branch 'songpete-patch-1'
Added a line to the change log for #1455