updated bootstrap typeahead
resolved conflicts