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
Moved functions from resource.erl and streams.erl
Moved help functions common to API files to a different module
posting user returns response
increased search limit to 200
Changed users.erl to fit with frontend
Changed error in resource.erl
Merge branch 'develop' of https://github.com/projectcs13/sensor-cloud into sp4.sc2.create_help_function_module

Conflicts:
	src/users.erl
Added "correct" deletion of streams and new testcases to test this
Added sleep to get test to work for travis
Added documentation for new functions
Merge branch 'sp4.sc2.model-auto-complete' of github.com:projectcs13/sensor-cloud into sp4.sc2.json_lib

Conflicts:
	test/users_tests.erl
made a lot of changes -_-
fixed user_test
bump
Merge pull request #49 from projectcs13/sp4.sc2.fix_resource_delete_streams

Sp4.sc2.fix resource delete streams
bump2