Merge branch 'develop' of github.com:projectcs13/sensor-cloud-website into Sp7.Sc1.UserRanking
Merge branch 'developSilverBullet' of github.com:projectcs13/sensor-cloud-website into Sp7.Sc1.UserRanking
Merge branch 'develop' of github.com:projectcs13/sensor-cloud-website into Sp7.Sc1.UserRanking
Implement the Relationship model
Add a 'followed streams' page
Add follow/unfollow buttons
user ranking system
added terms page, updated a bit the security page
Merge pull request #100 from projectcs13/sp7.sc2.terms_page

added terms page, updated a bit the security page
user ranking system
Merge branch 'develop' of github.com:projectcs13/sensor-cloud-website into Sp7.Sc1.UserRanking
Now you should be able to see the map in stream view
Merge pull request #103 from projectcs13/sp7.sc3.streams_view_map

Now you should be able to see the map in stream view
Merge pull request #101 from projectcs13/Sp7.Sc1.UserRanking

Sp7.sc1.user ranking
Add a god config file
fixed map javascript, locations are tagged with a number and highlighted once selected
added support for polling system in the front end
Add a script to start a Rails instance automatically on boot
Remove the god config file
Merge pull request #106 from projectcs13/sp7.sc3.map_fix

map js