Remove unused code in the searches_controller.rb file
Add a 'virtual stream' attribute to triggers
Implement creation and deletion of triggers for virtual streams
Implement toggle between streams and vstreams when creating a new trigger (WIP)
Fixed so alerts can be displayed from virtual streams
Updated so triggers are shown on virtual streams show page
Triggers for virtual streams should be fully functional now
Fixed Few things
Fix a bug occuring when selecting the span function when creating a vstream
Fix conflicts
Merge pull request #307 from projectcs13/sp9.sc2.issuefixes

Fixed Few things
Merge branch 'develop' of github.com:projectcs13/sensor-cloud-website into sp9.sc3.refact_map