major js search refactor
merge in master
Merge pull request #48 from tiger-swallowtails-2013/js_search_refactor

Js search refactor