Moved logic to more appropriate places. Fixed compiler warnings in ResearchService
Revamped research models
Added grouping and range options to Filter models
Backend prepped for new models
Added grouping support. Cleaned up javascript
Merged feature grouping