Updated parameter names and made marker placing more variable agnostic
first pass at JS/CSV method of generating scatterplots
Merge branch 'master' into Scatterplot-Update
Added ability to redefine axes on the fly
Added support for choosing instrument for x and y independently
Added highcharts library and scatterplot stuff
Merge branch 'master' into Scatterplot-Update
Removed highcharts
Re-add Highcharts into proper repository
Fixed bug where $_REQUEST['PSCID'] was getting checked incorrectly

Conflict resolver now saves properly
Rewrote query to use standard join syntax, so that indexes are used
Fixed bug where script didn't run properly since adding Visit_label column to test_battery
Fixed script so that it works with EARLI timepoints
Insert sessions in a bulk INSERT statement instead of PHP loop.

This works much, much faster.
Fixed bug that was causing session and candidate fields to not get populated in quat tables
Change number of columns per table to match quat
Changed from Within/Outside window to High Risk/Control
Merge branch 'Scatterplot-Update'
Made javascript use window.open() instead of location.href
Added ability to clear instrument if has "send_to_dcc" permission