doc update
Merge branch 'testing' of github.com:gigablast/open-source-search-engine into testing

Conflicts:
	html/faq.html
fix make
Merge branch 'testing'