Added keyboard show/hide, list view
Deleted #define
Merge remote-tracking branch 'origin/master'
Merged changes