Merge the two implementation of the controls.
Merge branch 'master' of https://github.com/lordmauve/epdojo2013