Update engine.erl
Merge pull request #161 from projectcs13/develop_merge

Develop merge
searching from front end properly stores the query
fixed test case
removed displays
Merge pull request #166 from projectcs13/sp7.sc2.fix_search_suggest

Sp7.sc2.fix search suggest
Merge branch 'develop' of https://github.com/projectcs13/sensor-cloud
into Sp7.Sc2.make_sure_username_unique

Conflicts:
	test/suggest_tests.erl