new user system
add manage keyboard
Merge remote-tracking branch 'origin/master'