Merge pull request #239 from clovis/master

Update upstream
Merge pull request #240 from clovis/master

Reduce reliance on jQueryUI to autocomplete