Basic searching working
Merge remote-tracking branch 'upstream/development' into development

Conflicts:
	client/scripts/main.js
Merge pull request #19 from ndhoule/development

Basic searching working