Move search-bar to template, Update search-result panels
Little CSS Refactor
Remove unnecessary @resource call
Render hidden form in smart creation
Merge branch 'sp7.sc1.smartCreation' of github.com:projectcs13/sensor-cloud-website into sp7.sc1.smartCreation
Ajax functionality when checking checkboxes, returns ID when checked, removes intermediate data in ES on unchecked
forgot spinner gif in commit
Merge branch 'sp7.sc1.smartCreation' of github.com:projectcs13/sensor-cloud-website into sp7.sc1.smartCreation
Smart creation seems to work
Merge branch 'develop' of github.com:projectcs13/sensor-cloud-website into sp7.sc3.polish_looks
Merge branch 'develop' of github.com:projectcs13/sensor-cloud-website into sp7.sc1.smartCreation

Conflicts:
	app/controllers/streams_controller.rb
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 with develop
Merge pull request #128 from projectcs13/sp7.sc3.chart_bug_fix

fix bug where graph does not show preperly when receiving values as stri...
Merge branch 'develop' of github.com:projectcs13/sensor-cloud-website into sp7.sc3.polish_looks
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