Merge pull request #1 from alaframboise/master

Added client-side filtering
Added sensor expression.  Had to be done...
using alto anvil; keyword search; ui work
 comments
resolve conflict
resolved conflict