Modified general structure and behavior of virtual fields
Merge remote-tracking branch 'upstream/master' into jp1387
Merge remote-tracking branch 'upstream/master' into jp1387
Added support for grouping and tracking point ids
Merge conflicts handled gracefully.
Updated Scatter so that it works when only one number field is present.
Addresses issue #1273 (see Description)
Style changes to pass Rubocop
Merge pull request #1414 from JKinsman1993/jk1273_alt

Addresses issue #1273 (see Description)
Merge pull request #1412 from jaypoulz/jp1387

Redid field IDs so that they work with groups.
Merge branch 'master' of https://github.com/isenseDev/rSENSE into check-more-coffee

Conflicts:
	lib/assets/javascripts/highvis/baseVis.coffee
	lib/assets/javascripts/highvis/highmodifiers.coffee
	lib/assets/javascripts/highvis/scatter.coffee
	lib/assets/javascripts/highvis/table.coffee
	lib/assets/javascripts/highvis/visUtils.coffee