Merge branch 'develop_silver_bullet' of
https://github.com/projectcs13/sensor-cloud into develop

Conflicts:
	include/field_restrictions.hrl
	src/search.erl
	src/streams.erl
	test/datapoints_tests.erl
	test/resources_tests.erl
	test/search_tests.erl
	test/streams_tests.erl
	test/users_tests.erl
Now all the tests passes, besides the suggest ones
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
virtual streams using pre-def functions
fixed virtual stream tests
Merge branch 'develop' of github.com:projectcs13/sensor-cloud into
sc6.sc3.vstreams_subscribing_to_several_streams

Conflicts:
	src/search.erl
	src/streams.erl
	test/datapoints_tests.erl
	test/resources_tests.erl
	test/search_tests.erl
	test/streams_tests.erl
	test/users_tests.erl