add no_iframes plugin
Highlighting search results: Added heuristic approach for common capitalizations, fixed indentions
Merge pull request #276 from wltb/Highlighting

Highlighting search results: Added heuristic approach for common capital...
experimentally simplify highlight searching
highlight: remove unnecessary test for DomText
Polish translation update.
Merge pull request #277 from sq5gvm/master

Updated polish (pl_PL) translation
add af plugins for nagional geographic and sciam
af_natgeo: remove some unneeded elements
fix af_sciam
Merge remote-tracking branch 'upstream/master'

Conflicts:
	locale/pl_PL/LC_MESSAGES/messages.mo
	locale/pl_PL/LC_MESSAGES/messages.po