manual and privacy
api
Merge branch 'develop' of github.com:projectcs13/sensor-cloud-website into Sp6.Sc1.StaticPages
aditions
Javascript asset loads depending on controller
Clean-up javascript assets
fix javascript require issue
made changes to the filters
Merge pull request #74 from projectcs13/sp6.sc3.working_filters

made changes to the filters
update dropdown menu, added choice none so you can search without sorting
fixed the faq page link in footer, also added request by costa to remove the search text in the search result
Merge pull request #78 from projectcs13/sp6.sc3.footer_faq_fix

Sp6.sc3.footer faq fix
Add graph of historical values for search results
Merge with develop
Merge pull request #79 from projectcs13/sp6.sc3.search_graph

Sp6.sc3.search graph
Merge pull request #77 from projectcs13/sp6.sc3.searches_dropdown_fix

Sp6.sc3.searches dropdown fix
Fix bugs
merge with develop
Merge pull request #68 from projectcs13/Sp6.Sc1.StaticPages

Sp6.sc1.static pages
merge with develop