Added keyboard settings page
Corrected bug when pausing video and restarting with a different video file
Merge remote-tracking branch 'origin/master'