Upgrade TrialTester

can now load stimuli files
copy paste works better
css improved
Various Updates

advancedShuffles.php

New shuffling added for csv files.  Columns with "AdvShuffle" (case-insensitive) in them will be shuffled with these new shuffles.
Possible shuffles:
-Shuffle
-Block shuffle
-List Shuffle

CustomFunctions.php
bug fixes, better formatting for display2dArray(), and a new function CreateAliases() to extract from an associative array

initiateCollector.php
removed inconsequential code

instructions.php
now sends data to new file InstructionsRecord.php

InstructionsRecord.php
handles recording of isntructions data, then sends to trial.php

login.php
changes the way that trialTypes are searched for, by just including the scanTrialTypes.php file
improved a small issue with required columns that was generating an e_notice
included the new advancedShuffles.php file to shuffle stimuli and procedure
set initial PostNumber to 0, since we don't need a -1 value to indicate that data is coming from instructions
gave the option to skip instructions using a setting in the Settings file

next.php
removed, code moved to trial.php as a function

trial.php
all data recording now happens from trial.php, without traveling to next.php
so, the code of next.php has been turned into a function, recordTrial()
aliases for stimuli columns are now created as well
the check for $_POST has been simplified in a few ways:
  -no longer checks for data from instructions.php
  -now simply checks if the trial type for postNumber+1 is actually a trial type, rather than the more complicated previous method
  -if data is to be written, it is simply written using the function recordTrial()
  -this should fix a bug, involving a poorly timed refresh or a back-navigation of the browser, that happened when assigning $text &= current post number text column, made it appear that the trial existed when it, in fact, did not
an output buffer is started before any html is sent, so that trial types can choose to redirect, if needed
Precacheing will correctly show next trials with multiple items

settings.php
now has the option to skip instructions.php

new custom trial types
demonstrates how to use some new features
Search Template in Getdata

getData now has the option to store the settings of a search, so you dont have to reclick all the options to get the same formatting of data.
More General Updates

small features and bug fixes

BasicInfo.php
added a few standard questions that a lot of people were using

BasicInfoData.php
bug fix of sorts, respects setting to skip instructions by moving to trial.php

global.css
set max width for condition select

CustomFunctions.php
addColumn now checks for columns with different case
BlockShuffle wont break if a shuffle column is missing
show() can now catch bmp images

login.php
removed "Shuffle" from the list of required columns
moved the code to add default columns before the shuffle, so that if any non-empty, dynamic columns are added, they are created before shuffles occur

scanTrialTypes.php
made this scan respect the file name of the default scoring, found in fileLocations.php

trialTester.php
added the "ExperimentFinished" final trial, to mimic the actual experiment more closely

Conditions.csv
changed reference to new.csv to PostTrials.csv, to reflect more descriptive renaming of file

All Trials.csv
removed CriterionTest as a demo trial type, since it is a pain to wait for when demonstrating the program

Demo.csv
added more trial type demonstrations

Instruct only.csv
removed, since it wasn't being used anywhere

LearningProcedureFiles.csv
changed text to reflect change from txt files to csv files.  Tutorial still incomplete

new.csv
renamed to PostTrials.csv to accurately describe purpose of file

PostTrials.csv
renamed from new.csv to more accurately describe purpose

Settings.php
added setting to display condition description, rather than number
added setting to allow display of stimuli and procedure file of condition, when hovering mouse over condition option

index.php
uses new settings to display different information for conditions
-setting $useConditionNames will fill the select with the Condition Description, rather than number
-setting $showConditionInfo will put the stimuli and procedure file name in the title attribute of the condition options, making that information appear as a tooltip when the option is hovered over with the mouse
Fixing typo in readme and adding text about citing Collector in published papers
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
Fix new getdata bug with the search template

-index.php now checks if the file found can actually be used
-generate.php no longer uses json pretty print, because our servers are a little bit out of date and don't support this yet.
update javascript

timer function now has a max waiting time of 10 seconds, so that it can still adjust itself without taxing cpu.

a new function hook has been created, so that custom script can be easily added to the form submit event.
Merging in Tyson's updates
stop checking for Shuffle columns

More useful condition descriptions
Merge branch 'master' into pr/n46_TysonKerr

Conflicts:
	Code/login.php
	Experiment/Conditions.csv