BIG OLE PUSH delete, server fix, search result template.
Merge branch 'master' of https://github.com/jeffj/hypermarks