Merged with develop
Merged with develop
Update streams.erl
Update users.erl
Merge pull request #189 from projectcs13/Sp7.Sc1.Subscriptions

Added subscription functionality in the backend
Merge branch 'develop' of https://github.com/projectcs13/sensor-cloud
into Sp7.Sc2.tiggers_in_stream_process

Conflicts:
	src/users.erl