rotation fix
kaka
Merge remote-tracking branch 'origin/master'
keyboard fix