Added color stepping functions
Added color stepping functions
Adding derived type query
Merge branch 'master' into derive
Implemented topN query type, refactored querySrv
Implemented topN query type, refactored querySrv
Deprecated derivequeries
Merged upstream