Knownode Input - Hybrid Search (Wikipedia and KnowNodes)
Knownode Input - Merging UI modifications
Merge remote-tracking branch 'origin/Wikinode' into Wikinode

Conflicts:
	modules/log.js