fixed hightlight with keyboard
solved merge conflicta
Merge pull request #418 from massiveart/feature/typeahead-update

Feature/typeahead update