Merge branch 'developSilverBullet' of github.com:projectcs13/sensor-cloud-website into sp6.sc3.filter_map
Merge branch 'developSilverBullet' of github.com:projectcs13/sensor-cloud-website into sp6.sc3.filter_map_query
fixed map filtering query
Merge pull request #87 from projectcs13/sp6.sc3.filter_map_query

Sp6.sc3.filter map query
Move filtered search to another page
Merge branch 'sp7.sc3.advanced_search' into developSilverBullet
Fix the slider in filtered search
Merge pull request #94 from projectcs13/developSilverBullet

Develop silver bullet