Adding keyboard2 controller.
Merge branch 'master' into gh-pages

* master:
  Adding keyboard2 controller.