Fixed keyboard layout on portrait
Fix crash on ART
Increased version number to 1.2.2
Merge branch 'master' into macii

Conflicts:
	project/AndroidManifest.xml
	project/res/layout/keyboard.xml
	project/res/layout/keyboard_alt.xml