Removed merge_list
Merge branch 'Sp4.Sc1.resource_test' of github.com:projectcs13/sensor-cloud into Sp4.Sc1.resource_test
Changed update so it adds the doc tag automatically
Changed test so they dont add the doc tag
Unclear changes
Merged with develop
Changed delete resource to finish properly
Fixed an error in delete resource and added some more time on the timer in the tests
Merge pull request #47 from projectcs13/Sp4.Sc1.Update_inconsistency

Sp4.sc1.update inconsistency