Corrected case where subset2 not defined but query being called
Fixed Grid View for Symbolic concepts; still has problems with numeric concepts
Merge branch 'london_hackaton' of github.com:transmart/transmartApp into london_hackaton
Minor edits