working on autocompletion with near search
Merge branch 'master' of github.com:GSETBrainControl2013/BrainControl into sabar
Merge remote-tracking branch 'origin/master' into joe