Merge pull request #33 from projectcs13/develop

Develop
Drop streams and resources tables
Change privacy type to string for resources
Modify the AddMissingAttributesFromStreamMapping migration
Merge branch 'master' of github.com:projectcs13/sensor-cloud-website into develop

Conflicts:
	db/schema.rb