This is actually the boxes on the front page. Sorry, wrong for branch.
Merge branch 'develop' of github.com:projectcs13/sensor-cloud-website into Sp7.Sc1.UsersSortBy
frontpage boxes beautification
merged filter map with searches map
frontpage boxes beautification
git commit -a -m "frontpage boxes beautification"
git status
q
sdfg
frontpage boxes beautification
Merge pull request #115 from projectcs13/sp7.sc3.map_filters

merged filter map with searches map
Merge pull request #116 from projectcs13/Sp7.Sc1.UsersSortBy

Front page beautification.
Forbid you to subscribe to your own stream
Merge branch 'develop' of github.com:projectcs13/sensor-cloud-website into develop
Merge branch 'develop' of github.com:projectcs13/sensor-cloud-website into sp7.sc1.suggestResource

Conflicts:
	app/controllers/streams_controller.rb