Merge pull request #18 from kendallm/master

Add file to upload config files
A couple of integration fixes

Fixed code in study-configuration.php to use include file for filenames
and fixed latent bug in cookie reader to catch the value more
consistently
Replaced stomped changes

Please sync with the master repo before submitting a pull request!!!!!
Added Automatic condition Id to study-configuration.php and added checkConditionId function to study-configuration.js