whitespace cleanup
whitespace cleanup
search now takes you directly to the item if there's only one returned
Merge branch 'develop' into testing