Merge branch 'develop' of github.com:projectcs13/sensor-cloud into develop
Adding the updated tests for resources and the resource file!
Fixed erlang install script, it didn't work properly before. Now it seems to work properly
Readded rebar to the project. My problem with rebar before was because I had an old version of erlang installed (because the install script was not working properly)
Small change in add_fields to handle valid JSON objects
Merge pull request #39 from projectcs13/sp4.sc2.fix_to_handle_json

Small change in add_fields to handle valid JSON objects
Changed from elastic_search to elasticsearch
Merge branch 'develop' of github.com:projectcs13/sensor-cloud into
Sp4.Sc1.resource_test

Conflicts:
	rebar.config
Removed all files that used mnesia, and the headerfiles, also removed
streams_resource as it was not used
Removed all files that used mnesia, and the headerfiles, also removed
streams_resource as it was not used
Fixed timeout
Fixed test
Added rebar from develop
Added a delay to the tests
Added MORE delay
Merge pull request #41 from projectcs13/sp4.sc2.remove_mnesia

Sp4.sc2.remove mnesia
corrected elasticsearch path
Merge branch 'develop' of github.com:projectcs13/sensor-cloud into Sp4.Sc1.resource_test
Stole some helpfunctions from streams.erl and removed search info when using GET on resources
Removed some displays