nextTrial var in trial.php, items in mcPic
fix empty cue or target on study or copy trials making the display weird
Updated trial tester
Merge pull request #42 from TysonKerr/minor-bug

nextTrial var in trial.php, items in mcPic
Merge pull request #43 from TysonKerr/trialTester-upgrade

Updated trial tester
upgrade trialTester to work through POST rather than GET
Merge pull request #44 from TysonKerr/trialTester-upgrade

upgrade trialTester to work through POST rather than GET
fixes problems with browser compatibility and special html characters in fields
Merge pull request #45 from TysonKerr/trialTester-upgrade

fixes problems with browser compatibility and special html characters in...
Merge remote-tracking branch 'origin/master' into variousUp

Conflicts:
	Code/scanTrialTypes.php
	Code/trial.php
	Code/trialLoader.php
	Code/trialTester.php
	Experiment/TrialTypes/Instruct.php
Merge Fixes

login.php
removed small error notice from checking for unset required columns, for post trials

trial.php
rearranged code so that the same variables available to the trials are available to the scoring files

trialLoader.php
updated to reflect changes to trial.php
modified recordTrial to prevent it from actually recording any data

vdrFreeRecall/scoring.php
updated to correctly skip selectivity index, only when it would result in division by zero

All Trials.csv
removed more trials with bothersome timing (tetris and OldNew)
-these can still be seen in the "Demo" condition

Settings.php
set demographics to true by default, since people seem to forget about that feature a bit
turned getdataPassword off by default again