test
test
adding better whisper function and typeahead
updated serverjs
typeahead fix
updated server.js
Merge branch 'devel'

Conflicts:
	server.js