Highlisht service
Merge branch 'master' into highlighter_v2

Conflicts:
	app/views/template modal.html
hide highlight bar when necessary + clean up
word-wrap:break-word in results
fixed bad bug
working highlight
fixed typo issues
one occurrence vs x times
occurrence
word-wrap for iframe
Merge pull request #40 from Papiel/highlighter_v2

Highlight service