Frontend switched to the new backend
Improve New Stream form (fields and transitions)
added stuff to filter ... im really tired today
Merge branch 'develop' of github.com:projectcs13/sensor-cloud-website into sp6.sc3.filter_map
Connect with the backend
Merge branch 'develop' of github.com:projectcs13/sensor-cloud-website into developSilverBullet

Conflicts:
	app/assets/javascripts/searches.js
	app/assets/javascripts/streams.js.coffee
	config/routes.rb
Update show.html.erb

Stars.
Merge branch 'develop' of github.com:projectcs13/sensor-cloud-website into sp6.sc3.filter_map
Fix indentation and 2 attributes missing
Merge branch 'developSilverBullet' of github.com:projectcs13/sensor-cloud-website into developSilverBullet

Conflicts:
	app/views/searches/show.html.erb
Add the event handler that was removed
Fix edition of streams with invalid fields
added location filter map, no search query code as of now
Fix navigation link to Stream View
Merge pull request #83 from projectcs13/sp6.sc3.filter_map

Sp6.sc3.filter map
Update searches.js.coffee
Add some CSS to the search bar in the header
Fix conflicts
Merge pull request #85 from projectcs13/dSB

D sb
Merge pull request #86 from projectcs13/developSilverBullet

Develop silver bullet