Changed the restricted fields for update, and changed the tests
accordingly
Update analyse.erl

changed from streamid to stream_id so that it follows the mapping
Small change in error message for missing parent
Merge pull request #126 from projectcs13/Sp6.Sc2.small_fix_to_error_message

Small change in error message for missing parent
Merge pull request #123 from projectcs13/Sp6.Sc2.change_restricted_fields

Changed the restricted fields for update, and changed the tests
Merge branch 'develop' of https://github.com/projectcs13/sensor-cloud
into Sp6.Sc2.delete_children_when_parent_deleted

Conflicts:
	test/resources_tests.erl