added user profile
pulled develop and solved conflicts
Fixed Follow count in user profile
Pull develop
Merge with develop and fix conflicts
Merge branch 'develop' of github.com:projectcs13/sensor-cloud-website into sp7.sc2.user_profile

Conflicts:
	app/assets/stylesheets/custom.css.scss
Update streams.js.coffee

remove alert that happens when you switch the live-update button
now map filtering works
Improve the UI of User Profile
Fix layout because I broke it first
Merge pull request #123 from projectcs13/sp7.sc2.user_profile

Sp7.sc2.user profile
Merge pull request #124 from projectcs13/sp7.sc3.map_filtering

now map filtering works
fixed map in search
Little refactor in streams file
Merge branch 'develop' of github.com:projectcs13/sensor-cloud-website into develop

Conflicts:
	app/assets/javascripts/streams.js.coffee
fix bug where graph does not show preperly when receiving values as strings
Merge pull request #128 from projectcs13/sp7.sc3.chart_bug_fix

fix bug where graph does not show preperly when receiving values as stri...
starting of cleanup process when doing a new search fro resources.
Merge branch 'develop' of github.com:projectcs13/sensor-cloud-website into sp7.sc1.smartCreation

Conflicts:
	app/assets/javascripts/streams.js.coffee
	app/controllers/streams_controller.rb
Merge pull request #127 from projectcs13/sp7.sc3.map_filtering

fixed map in search