Merge branch 'John'
Merge branch 'John'
Merge branch 'John'
fixed browser issue with a keyboard input

using the letter R as a keyboard input would affect the browser by not
allowing R to be used in a refresh command
Merge branch 'master' into John