Move around searchTerm escaping, document.
Fix conflicts.

Merge branch '2.0' of github.com:s9y/Serendipity into 2.0

Conflicts:
	docs/NEWS