Changed so that resources(and streams) get deleted when the owner(user) gets deleted. Also fixed the update in resource.erl.
Merge branch 'develop' of https://github.com/projectcs13/sensor-cloud into Sp4.Sc1.Delete_resources_when_deleting_user
Fixed error in users.erl caused by another branch being merged and fix
documentation issue
Changed the name to resources from resource so that all file names are plural
Merged with develop
Merging 'Delete_resources_when_deleting_user' with develop
Merging is done, needed to change some stuff so they used new helpfunctions and stuff
initial commit for updating a suggestion
update
updated again
Removed analyse, should not have been in this branch...
Added new functions in lib_json
Merge branch 'sp6.sc2.update_suggestion' of https://github.com/projectcs13/sensor-cloud into sp6.sc2.update_suggestion

Conflicts:
	src/suggest.erl
Added a function for updaing the weight of a suggestion Json. Not sure if calc/1 handles the format of the Json, so that may need to be changed.
I used the wrong name for the replace_field function
For some reason two lines got changed in resource.erl, they are now back to what develop looks like
changed some things in scoring.erl
changes in code
Since my travis test is failing, I tried to fix the datapoint test, maybe it is a problem with the timer ?
added test.. fails