Top keyboard
Merge branch 'top-keyboard'

Conflicts:
	javascripts/keyboard.coffee