Closes #102. Fixed bug that was causing issues with markers for some elements
Closes #95. Search will now focus the element that contains the matching text
Merge branch 'develop' into mine