diff --git a/.phan/config.php b/.phan/config.php
index a9467962613..fe24edcfb13 100644
--- a/.phan/config.php
+++ b/.phan/config.php
@@ -8,9 +8,7 @@
 	// This is false on the assumption that that's a typo.
 	// It doesn't seem to have any effect on LORIS's codebase anyways.
 	"quick_mode" => false,
-	// FIXME: analyze signature compatibility should be true, but
-	// there's too many other things to fix first.
-	"analyze_signature_compatibility" => false,
+	"analyze_signature_compatibility" => true,
 	// FIXME: allow_missing_properties should be false, but there's
 	// too many other things to fix first.
 	"allow_missing_properties" => true,
@@ -31,8 +29,6 @@
 		"PhanUndeclaredClassMethod",
 		"PhanUndeclaredTypeParameter",
 		"PhanUndeclaredConstant",
-		"PhanUndeclaredClass",
-		"PhanUndeclaredExtendedClass",
 		"PhanTypeMismatchForeach",
 		"PhanTypeMismatchDefault",
 		"PhanTypeMismatchArgument",
@@ -51,7 +47,7 @@
 	"directory_list" => [
 		/* This doesn't include php/installer, because there's
 		   (intentionally) classes in the installer namespace
-                   which redeclare classes from php/libraries, in order
+           which redeclare classes from php/libraries, in order
 		   to bootstrap the installer before the config/database
 		   is set up */
 		"php/libraries",
@@ -60,8 +56,14 @@
 		"modules",
         "src",
 		"vendor",
+        "test"
 	],
 	"exclude_analysis_directory_list" => [
 		"vendor",
 	],
+    'autoload_internal_extension_signatures' => [
+        // Xdebug stubs are bundled with Phan 0.10.1+/0.8.9+ for usage,
+        // because Phan disables xdebug by default.
+        'xdebug'     => 'vendor/phan/phan/.phan/internal_stubs/xdebug.phan_php',
+    ],
 ];
diff --git a/.travis.yml b/.travis.yml
index 13066452533..02072613311 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,12 @@
 language: php
 
+
 cache:
     directories:
         - vendor
-
 php:
-    - "7.2"
     - "7.1"
-
-sudo: false
+    - "7.2"
 
 addons:
     firefox: "44.0"
@@ -24,22 +22,26 @@ before_install:
     - nvm install node
     - mkdir -p project project/libraries
     - phpenv config-rm xdebug.ini
+<<<<<<< HEAD
     - pecl install -f ast-0.1.6
 
+=======
+    - if [[ ${TRAVIS_PHP_VERSION:0:3} == "7.0" ]]; then Dir="router.php" ; fi
+    - if [[ ${TRAVIS_PHP_VERSION:0:3} == "7.1" ]]; then Dir="htdocs/router.php" ; fi
+    - php -S localhost:8000 -t htdocs $Dir 2>1 > /dev/null &
+>>>>>>> aces/minor
 install:
     # Install composer modules
     - composer install
     - composer require --dev
     - phpenv rehash
 
+
     # Install node modules specified in package.json
     - npm install
 
     # Download a Selenium Web Driver release
     - wget "http://selenium-release.storage.googleapis.com/2.52/selenium-server-standalone-2.52.0.jar"
-
-    - php -S localhost:8000 -t htdocs htdocs/router.php 2>1 > /dev/null &
-
     # Extracting firefox and setting PATH variable...
     - tar -xjf /tmp/firefox-44.0.tar.bz2 --directory /tmp
     - export PATH="/tmp/firefox:$PATH"
@@ -51,6 +53,8 @@ install:
     - DISPLAY=:99.0 java -jar selenium-server-standalone-2.52.0.jar  2>1 > /dev/null &
 
 before_script:
+
+
     # Set up the Loris environment
     - mkdir -p project smarty/templates_c project/instruments project/tables_sql
     - chmod 777 smarty/templates_c project/instruments project/tables_sql
@@ -95,7 +99,10 @@ before_script:
  # - "LORIS_DB_CONFIG=test/config.xml"
 
 script:
+<<<<<<< HEAD
     - vendor/bin/phan
+=======
+>>>>>>> aces/minor
     - npm run lint:php && npm run lint:javascript && vendor/bin/phpunit --configuration test/phpunit.xml
 
 dist: precise
diff --git a/SQL/0000-00-00-schema.sql b/SQL/0000-00-00-schema.sql
index 827cc478b16..63e0305a499 100644
--- a/SQL/0000-00-00-schema.sql
+++ b/SQL/0000-00-00-schema.sql
@@ -532,27 +532,26 @@ CREATE TABLE `tarchive_files` (
 
 
 CREATE TABLE `ImagingFileTypes` (
- `type` varchar(255) NOT NULL PRIMARY KEY
+ `type` varchar(12) NOT NULL PRIMARY KEY,
+ `description` varchar(255) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 
-INSERT INTO `ImagingFileTypes` VALUES
-      ('mnc'),
-      ('obj'),
-      ('xfm'),
-      ('xfmmnc'),
-      ('imp'),
-      ('vertstat'),
-      ('xml'),
-      ('txt'),
-      ('nii'),
-      ('nii.gz'),
-      ('nrrd');
+INSERT INTO `ImagingFileTypes` (type, description) VALUES
+  ('mnc',      'MINC file'),
+  ('obj',      'MNI BIC imaging format for a surface'),
+  ('xfm',      'MNI BIC linear transformation matrix file'),
+  ('vertstat', 'MNI BIC imaging format for a field on a surface (e.g. cortical thickness)'),
+  ('xml',      'XML file'),
+  ('txt',      'text file'),
+  ('nii',      'NIfTI file'),
+  ('nrrd',     'NRRD file format (used by DTIPrep)'),
+  ('grid_0',   'MNI BIC non-linear field for non-linear transformation');
 
 CREATE TABLE `mri_processing_protocol` (
   `ProcessProtocolID` int(11) unsigned NOT NULL AUTO_INCREMENT,
   `ProtocolFile` varchar(255) NOT NULL DEFAULT '',
-  `FileType` varchar(255) DEFAULT NULL,
+  `FileType` varchar(12) DEFAULT NULL,
   `Tool` varchar(255) NOT NULL DEFAULT '',
   `InsertTime` int(10) unsigned NOT NULL DEFAULT '0',
   `md5sum` varchar(32) DEFAULT NULL,
@@ -620,7 +619,7 @@ CREATE TABLE `files` (
   `CoordinateSpace` varchar(255) default NULL,
   `OutputType` varchar(255) NOT NULL default '',
   `AcquisitionProtocolID` int(10) unsigned default NULL,
-  `FileType` varchar(255) default NULL,
+  `FileType` varchar(12) default NULL,
   `PendingStaging` tinyint(1) NOT NULL default '0',
   `InsertedByUserID` varchar(255) NOT NULL default '',
   `InsertTime` int(10) unsigned NOT NULL default '0',
@@ -1340,11 +1339,13 @@ CREATE TABLE `media` (
   `uploaded_by` varchar(255) DEFAULT NULL,
   `hide_file` tinyint(1) DEFAULT '0',
   `date_uploaded` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `language_id` int(10) unsigned DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `file_name` (`file_name`),
   FOREIGN KEY (`session_id`) REFERENCES `session` (`ID`),
-  FOREIGN KEY (`instrument`) REFERENCES `test_names` (`Test_name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+  FOREIGN KEY (`instrument`) REFERENCES `test_names` (`Test_name`),
+  CONSTRAINT `FK_media_language` FOREIGN KEY (`language_id`) REFERENCES `language` (`language_id`)
+  ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 -- ********************************
 -- issues tables
@@ -1410,7 +1411,7 @@ CREATE TABLE `issues_history` (
   `addedBy` varchar(255) NOT NULL DEFAULT '',
   PRIMARY KEY (`issueHistoryID`),
   KEY `fk_issues_comments_1` (`issueID`),
-  CONSTRAINT `fk_issues_comments_1` FOREIGN KEY (`issueID`) REFERENCES `issues` (`issueID`)
+  CONSTRAINT `fk_issues_comments_1` FOREIGN KEY (`issueID`) REFERENCES `issues` (`issueID`) ON DELETE CASCADE ON UPDATE RESTRICT
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 CREATE TABLE `issues_comments` (
@@ -1421,7 +1422,7 @@ CREATE TABLE `issues_comments` (
   `issueComment` text NOT NULL,
   PRIMARY KEY (`issueCommentID`),
   KEY `fk_issue_comments_1` (`issueID`),
-  CONSTRAINT `fk_issue_comments_1` FOREIGN KEY (`issueID`) REFERENCES `issues` (`issueID`)
+  CONSTRAINT `fk_issue_comments_1` FOREIGN KEY (`issueID`) REFERENCES `issues` (`issueID`) ON DELETE CASCADE ON UPDATE RESTRICT
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 CREATE TABLE `issues_comments_history` (
@@ -1432,7 +1433,7 @@ CREATE TABLE `issues_comments_history` (
   `editedBy` varchar(255) NOT NULL DEFAULT '',
   PRIMARY KEY (`issueCommentHistoryID`),
   KEY `fk_issues_comments_history` (`issueCommentID`),
-  CONSTRAINT `fk_issues_comments_history` FOREIGN KEY (`issueCommentID`) REFERENCES `issues_comments` (`issueCommentID`)
+  CONSTRAINT `fk_issues_comments_history` FOREIGN KEY (`issueCommentID`) REFERENCES `issues_comments` (`issueCommentID`) ON DELETE CASCADE ON UPDATE RESTRICT
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 CREATE TABLE `issues_watching` (
@@ -1545,7 +1546,7 @@ CREATE TABLE `parameter_session` (
   KEY `session_type` (`SessionID`,`ParameterTypeID`),
   KEY `parameter_value` (`ParameterTypeID`,`Value`(64)),
   CONSTRAINT `FK_parameter_session_2` FOREIGN KEY (`ParameterTypeID`) REFERENCES `parameter_type` (`ParameterTypeID`),
-  CONSTRAINT `FK_parameter_session_1` FOREIGN KEY (`SessionID`) REFERENCES `session` (`ID`)
+  CONSTRAINT `FK_parameter_session_1` FOREIGN KEY (`SessionID`) REFERENCES `session` (`ID`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 CREATE TABLE `parameter_type_override` (
@@ -1779,8 +1780,8 @@ CREATE TABLE `genomic_cpg` (
   `beta_value` decimal(4,3) DEFAULT NULL,
   PRIMARY KEY (`sample_label`,`cpg_name`),
   KEY `cpg_name` (`cpg_name`),
-  CONSTRAINT `genomic_cpg_ibfk_1` FOREIGN KEY (`sample_label`) REFERENCES `genomic_sample_candidate_rel` (`sample_label`),
-  CONSTRAINT `genomic_cpg_ibfk_2` FOREIGN KEY (`cpg_name`) REFERENCES `genomic_cpg_annotation` (`cpg_name`)
+  CONSTRAINT `genomic_cpg_ibfk_1` FOREIGN KEY (`sample_label`) REFERENCES `genomic_sample_candidate_rel` (`sample_label`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `genomic_cpg_ibfk_2` FOREIGN KEY (`cpg_name`) REFERENCES `genomic_cpg_annotation` (`cpg_name`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 -- ********************************
diff --git a/SQL/0000-00-03-ConfigTables.sql b/SQL/0000-00-03-ConfigTables.sql
index b0dfb4e1e1b..47f0a5fcceb 100644
--- a/SQL/0000-00-03-ConfigTables.sql
+++ b/SQL/0000-00-03-ConfigTables.sql
@@ -108,6 +108,7 @@ INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType,
 INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'LivingPhantomRegex', 'Regex to be used on Living Phantom scan header', 1, 0, 'text', ID, 'Living phantom regex', 4 FROM ConfigSettings WHERE Name="imaging_modules";
 INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'showTransferStatus', 'Show transfer status in the DICOM Archive table', 1, 0, 'boolean', ID, 'Show transfer status', 5 FROM ConfigSettings WHERE Name="imaging_modules";
 INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'tblScanTypes', 'Scan types from the mri_scan_type table that the project wants to see displayed in Imaging Browser table', 1, 1, 'scan_type', ID, 'Imaging Browser Tabulated Scan Types', 6 FROM ConfigSettings WHERE Name="imaging_modules";
+INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'ImagingBrowserLinkedInstruments', 'Instruments that the users want to see linked from Imaging Browser', 1, 1, 'instrument', ID, 'Imaging Browser Links to Instruments', 7 FROM ConfigSettings WHERE Name="imaging_modules";
 
 
 INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, Label, OrderNumber) VALUES ('statistics', 'Statistics module settings', 1, 0, 'Statistics', 7);
@@ -136,14 +137,13 @@ INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType,
 INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'prefix', 'Study prefix or study name', 1, 0, 'text', ID, 'Study Name', 2 FROM ConfigSettings WHERE Name="imaging_pipeline";
 INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'mail_user', 'User to be notified during imaging pipeline execution', 1, 0, 'text', ID, 'User to notify when executing the pipeline', 3 FROM ConfigSettings WHERE Name="imaging_pipeline";
 INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'get_dicom_info', 'Full path to get_dicom_info.pl', 1, 0, 'text', ID, 'Full path to get_dicom_info.pl script', 4 FROM ConfigSettings WHERE Name="imaging_pipeline";
-INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'horizontalPics', 'Generate horizontal pictures', 1, 0, 'boolean', ID, 'Horizontal pictures creation', 5 FROM ConfigSettings WHERE Name="imaging_pipeline";
-INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'no_nii', 'Create NIFTII files if set to 0', 1, 0, 'boolean', ID, 'NIFTII file creation', 6 FROM ConfigSettings WHERE Name="imaging_pipeline";
+INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'horizontalPics', 'Enable generation of horizontal pictures', 1, 0, 'boolean', ID, 'Horizontal pictures creation', 5 FROM ConfigSettings WHERE Name="imaging_pipeline";
+INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'create_nii', 'Enable creation of NIfTI files', 1, 0, 'boolean', ID, 'NIfTI file creation', 6 FROM ConfigSettings WHERE Name="imaging_pipeline";
 INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'converter', 'If converter is set to dcm2mnc, the c-version of dcm2mnc will be used. If however you want to use any of the various versions of the converter, you will have to specify what it is called and the uploader will try to invoke it', 1, 0, 'text', ID, 'dcm2mnc binary to use when converting', 7 FROM ConfigSettings WHERE Name="imaging_pipeline";
 INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'tarchiveLibraryDir', 'Location of storing the library of used tarchives. If this is not set, they will not be moved', 1, 0, 'text', ID, 'Path to Tarchives', 8 FROM ConfigSettings WHERE Name="imaging_pipeline";
-INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'lookupCenterNameUsing', 'The element of the tarchive table to be used in getPSC(), being either PatientID or PatientName', 1, 0, 'text', ID, 'Center name lookup variable', 9 FROM ConfigSettings WHERE Name="imaging_pipeline";
-INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'createCandidates', 'Creation of candidates if set to 1', 1, 0, 'boolean', ID, 'Upload creation of candidates', 10 FROM ConfigSettings WHERE Name="imaging_pipeline";
-INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'is_qsub', 'Do not use batch management if qsub is set to 0', 1, 0, 'boolean', ID, 'Project batch management used', 11 FROM ConfigSettings WHERE Name="imaging_pipeline";
-INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'if_site', 'Use site if set to 1', 1, 0, 'boolean', ID, 'If site is used', 12 FROM ConfigSettings WHERE Name="imaging_pipeline";
+INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'lookupCenterNameUsing', 'DICOM field (either PatientName or PatientID) to use to get the patient identifiers and the center name of the DICOM study', 1, 0, 'text', ID, 'Patient identifiers and center name lookup variable', 9 FROM ConfigSettings WHERE Name="imaging_pipeline";
+INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'createCandidates', 'Enable candidate creation in the imaging pipeline', 1, 0, 'boolean', ID, 'Upload creation of candidates', 10 FROM ConfigSettings WHERE Name="imaging_pipeline";
+INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'is_qsub', 'Enable use of batch management in the imaging pipeline', 1, 0, 'boolean', ID, 'Project batch management used', 11 FROM ConfigSettings WHERE Name="imaging_pipeline";
 INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'DTI_volumes', 'Number of volumes in native DTI acquisitions', 1, 0, 'text', ID, 'Number of volumes in native DTI acquisitions', 13 FROM ConfigSettings WHERE Name="imaging_pipeline";
 INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 't1_scan_type', 'Scan type of native T1 acquisition (as in the mri_scan_type table)', 1, 0, 'text', ID, 'Scan type of native T1 acquisition', 14 FROM ConfigSettings WHERE Name="imaging_pipeline";
 INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'reject_thresh', 'Max number of directions that can be rejected to PASS QC', 1, 0, 'text', ID, 'Max number of DTI rejected directions for passing QC', 15 FROM ConfigSettings WHERE Name="imaging_pipeline";
@@ -210,7 +210,8 @@ INSERT INTO Config (ConfigID, Value) SELECT ID, "/phantom/i" FROM ConfigSettings
 INSERT INTO Config (ConfigID, Value) SELECT ID, "false" FROM ConfigSettings WHERE Name="showTransferStatus";
 INSERT INTO Config (ConfigID, Value) SELECT cs.ID, GROUP_CONCAT(mst.Scan_Type) FROM ConfigSettings cs JOIN mri_scan_type mst WHERE cs.Name="tblScanTypes" AND mst.ID=44;
 INSERT INTO Config (ConfigID, Value) SELECT cs.ID, GROUP_CONCAT(mst.Scan_Type) FROM ConfigSettings cs JOIN mri_scan_type mst WHERE cs.Name="tblScanTypes" AND mst.ID=45;
-
+INSERT INTO Config (ConfigID, Value) SELECT cs.ID, "mri_parameter_form" FROM ConfigSettings cs WHERE cs.Name="ImagingBrowserLinkedInstruments";
+INSERT INTO Config (ConfigID, Value) SELECT cs.ID, "radiology_review" FROM ConfigSettings cs WHERE cs.Name="ImagingBrowserLinkedInstruments";
 
 INSERT INTO Config (ConfigID, Value) SELECT ID, "radiology_review" FROM ConfigSettings WHERE Name="excludedMeasures";
 INSERT INTO Config (ConfigID, Value) SELECT ID, "mri_parameter_form" FROM ConfigSettings WHERE Name="excludedMeasures";
@@ -229,13 +230,12 @@ INSERT INTO Config (ConfigID, Value) SELECT ID, "project" FROM ConfigSettings cs
 INSERT INTO Config (ConfigID, Value) SELECT ID, "yourname\@example.com" FROM ConfigSettings cs WHERE cs.Name="mail_user";
 INSERT INTO Config (ConfigID, Value) SELECT ID, "/PATH/TO/get_dicom_info.pl" FROM ConfigSettings cs WHERE cs.Name="get_dicom_info";
 INSERT INTO Config (ConfigID, Value) SELECT ID, 1 FROM ConfigSettings cs WHERE cs.Name="horizontalPics";
-INSERT INTO Config (ConfigID, Value) SELECT ID, 0 FROM ConfigSettings cs WHERE cs.Name="no_nii";
+INSERT INTO Config (ConfigID, Value) SELECT ID, 1 FROM ConfigSettings cs WHERE cs.Name="create_nii";
 INSERT INTO Config (ConfigID, Value) SELECT ID, "dcm2mnc" FROM ConfigSettings cs WHERE cs.Name="converter";
 INSERT INTO Config (ConfigID, Value) SELECT ID, "/PATH/TO/dicomlib/" FROM ConfigSettings cs WHERE cs.Name="tarchiveLibraryDir";
 INSERT INTO Config (ConfigID, Value) SELECT ID, "PatientName" FROM ConfigSettings cs WHERE cs.Name="lookupCenterNameUsing";
 INSERT INTO Config (ConfigID, Value) SELECT ID, 1 FROM ConfigSettings cs WHERE cs.Name="createCandidates";
 INSERT INTO Config (ConfigID, Value) SELECT ID, 0 FROM ConfigSettings cs WHERE cs.Name="is_qsub";
-INSERT INTO Config (ConfigID, Value) SELECT ID, 1 FROM ConfigSettings cs WHERE cs.Name="if_site";
 INSERT INTO Config (ConfigID, Value) SELECT ID, 65 FROM ConfigSettings cs WHERE cs.Name="DTI_volumes";
 INSERT INTO Config (ConfigID, Value) SELECT ID, "adniT1" FROM ConfigSettings cs WHERE cs.Name="t1_scan_type";
 INSERT INTO Config (ConfigID, Value) SELECT ID, 19 FROM ConfigSettings cs WHERE cs.Name="reject_thresh";
diff --git a/SQL/New_patches/2017-06-13-addUserLanguagePreference.sql b/SQL/Archive/19.1/2017-06-13-addUserLanguagePreference.sql
similarity index 86%
rename from SQL/New_patches/2017-06-13-addUserLanguagePreference.sql
rename to SQL/Archive/19.1/2017-06-13-addUserLanguagePreference.sql
index b8ebcf6ae82..2b695cc3f88 100644
--- a/SQL/New_patches/2017-06-13-addUserLanguagePreference.sql
+++ b/SQL/Archive/19.1/2017-06-13-addUserLanguagePreference.sql
@@ -7,7 +7,6 @@ CREATE TABLE `language` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 INSERT INTO language (language_code, language_label) VALUES ('en-CA', 'English');
---INSERT INTO language (language_code, language_label) VALUES ('fr-CA', 'French');
 
 ALTER TABLE users ADD language_preference integer unsigned DEFAULT NULL;
 ALTER TABLE users ADD CONSTRAINT `FK_users_2` FOREIGN KEY (`language_preference`) REFERENCES `language` (`language_id`);
\ No newline at end of file
diff --git a/SQL/Archive/19.1/2017-12-15_media_add_language_to_UploadFile.sql b/SQL/Archive/19.1/2017-12-15_media_add_language_to_UploadFile.sql
new file mode 100644
index 00000000000..eadf425064a
--- /dev/null
+++ b/SQL/Archive/19.1/2017-12-15_media_add_language_to_UploadFile.sql
@@ -0,0 +1,3 @@
+ALTER TABLE media ADD COLUMN  language_id INT UNSIGNED DEFAULT NULL;
+ALTER TABLE media ADD CONSTRAINT `FK_media_language` FOREIGN KEY (`language_id`) REFERENCES `language` (`language_id`);
+
diff --git a/SQL/Archive/19.1/2018-01-30_Add_description_to_ImagingFileTypes.sql b/SQL/Archive/19.1/2018-01-30_Add_description_to_ImagingFileTypes.sql
new file mode 100644
index 00000000000..25cfa175d34
--- /dev/null
+++ b/SQL/Archive/19.1/2018-01-30_Add_description_to_ImagingFileTypes.sql
@@ -0,0 +1,80 @@
+-- Disable Foreign key to be able to change type
+-- of FileType to VARCHAR(12) in files, 
+-- mri_processing_protocol and ImagingFileType
+SET FOREIGN_KEY_CHECKS=0;
+
+-- ALTER files to drop the FK_files_FileTypes
+ALTER TABLE files
+  MODIFY `FileType` VARCHAR(12);
+
+-- ALTER mri_processing_protocol to drop the 
+-- FK_mri_processing_protocol_FileTypes
+ALTER TABLE mri_processing_protocol 
+  MODIFY `FileType` VARCHAR(12);
+
+-- ALTER ImagingFileTypes table to add a `description` column 
+ALTER TABLE ImagingFileTypes
+  MODIFY `type` VARCHAR(12) NOT NULL,
+  ADD `description` VARCHAR(255) DEFAULT NULL;
+
+-- Re-enable the forein keys
+SET FOREIGN_KEY_CHECKS=1;
+
+-- ADD description to the different type
+UPDATE ImagingFileTypes
+  SET description='MINC file'
+  WHERE type='mnc';
+
+UPDATE ImagingFileTypes
+  SET description='3D imaging format'
+  WHERE type='obj';
+
+UPDATE ImagingFileTypes
+  SET description='transformation matrix file'
+  WHERE type='xfm';
+
+UPDATE ImagingFileTypes
+  SET description=NULL
+  WHERE type='xfmmnc';
+
+UPDATE ImagingFileTypes
+  SET description='audition impulse file'
+  WHERE type='imp';
+
+UPDATE ImagingFileTypes
+  SET description='file describing the cortical thickness in a single column'
+  WHERE type='vertstat';
+
+UPDATE ImagingFileTypes
+  SET description='XML file'
+  WHERE type='xml';
+
+UPDATE ImagingFileTypes
+  SET description='text file'
+  WHERE type='txt';
+
+UPDATE ImagingFileTypes
+  SET description='NIfTI file'
+  WHERE type='nii';
+
+UPDATE ImagingFileTypes
+  SET description='NRRD file format (used by DTIPrep)'
+  WHERE type='nrrd';
+
+INSERT INTO ImagingFileTypes (type, description)
+  VALUES ('grid_0', 'MNI BIC non-linear field for non-linear transformation');
+
+-- DELETE xfmmnc entry as no one understand what it is referring to
+DELETE FROM ImagingFileTypes
+  WHERE type='xfmmnc';
+
+-- MAP .nii.gz file type in files table to .nii and delete .nii
+UPDATE files
+  SET FileType='nii'
+  WHERE FileType='nii.gz';
+DELETE FROM ImagingFileTypes
+  WHERE type='nii.gz';
+
+-- delete .imp (obscure file type not used currently in any project)
+DELETE FROM ImagingFileTypes
+  WHERE type='imp';
diff --git a/SQL/Archive/19.1/2018-02-15_AddCustomizableCRFsUnderLinksInImagBrowser.sql b/SQL/Archive/19.1/2018-02-15_AddCustomizableCRFsUnderLinksInImagBrowser.sql
new file mode 100644
index 00000000000..3c033c2e788
--- /dev/null
+++ b/SQL/Archive/19.1/2018-02-15_AddCustomizableCRFsUnderLinksInImagBrowser.sql
@@ -0,0 +1,33 @@
+-- Add Imaging Browser to Imaging Modules
+INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'ImagingBrowserLinkedInstruments', 'Instruments that the users want to see linked from Imaging Browser', 1, 1, 'instrument', ID, 'Imaging Browser Links to Instruments', 7 FROM ConfigSettings WHERE Name="imaging_modules";
+
+-- Default imaging_browser settings for Linked instruments
+-- This will be the two tables mri_parameter_form and radiology_review; IF they exist in the database
+SET @s1 = (SELECT IF(
+    (SELECT COUNT(*)
+        FROM INFORMATION_SCHEMA.TABLES
+        WHERE table_name = 'mri_parameter_form'
+        AND table_schema = DATABASE()
+    ) > 0,
+    "INSERT INTO Config (ConfigID, Value) SELECT cs.ID, 'mri_parameter_form' FROM ConfigSettings cs WHERE cs.Name='ImagingBrowserLinkedInstruments'",
+    "SELECT 'No. It is therefore not inserted into the Configuration module under Imaging Modules' as 'mri parameter_form table exists?'"
+));
+
+PREPARE stmt1 FROM @s1;
+EXECUTE stmt1;
+DEALLOCATE PREPARE stmt1;
+
+SET @s2 = (SELECT IF(
+    (SELECT COUNT(*)
+        FROM INFORMATION_SCHEMA.TABLES
+        WHERE table_name = 'radiology_review'
+        AND table_schema = DATABASE()
+    ) > 0,
+    "INSERT INTO Config (ConfigID, Value) SELECT cs.ID, 'mri_parameter_form' FROM ConfigSettings cs WHERE cs.Name='ImagingBrowserLinkedInstruments'",
+    "SELECT 'No. It is therefore not inserted into the Configuration module under Imaging Modules' as 'radiology_review table exists?'"
+));
+
+PREPARE stmt2 FROM @s2;
+EXECUTE stmt2;
+DEALLOCATE PREPARE stmt2;
+
diff --git a/SQL/Archive/2018-02-28_issues_add_cascade.sql b/SQL/Archive/2018-02-28_issues_add_cascade.sql
new file mode 100644
index 00000000000..8b42fa8b34c
--- /dev/null
+++ b/SQL/Archive/2018-02-28_issues_add_cascade.sql
@@ -0,0 +1,8 @@
+ALTER TABLE issues_history DROP FOREIGN KEY `fk_issues_comments_1`;
+ALTER TABLE issues_history ADD CONSTRAINT `fk_issues_comments_1` FOREIGN KEY (`issueID`) REFERENCES `issues` (`issueID`) ON DELETE CASCADE ON UPDATE RESTRICT;
+
+ALTER TABLE issues_comments DROP FOREIGN KEY `fk_issue_comments_1`;
+ALTER TABLE issues_comments ADD CONSTRAINT `fk_issue_comments_1` FOREIGN KEY (`issueID`) REFERENCES `issues` (`issueID`) ON DELETE CASCADE ON UPDATE RESTRICT;
+
+ALTER TABLE issues_comments_history DROP FOREIGN KEY `fk_issues_comments_history`;
+ALTER TABLE issues_comments_history ADD CONSTRAINT `fk_issues_comments_history` FOREIGN KEY (`issueCommentID`) REFERENCES `issues_comments` (`issueCommentID`) ON DELETE CASCADE ON UPDATE RESTRICT;
diff --git a/SQL/Archive/2018-03-01_genomics_add_cascade.sql b/SQL/Archive/2018-03-01_genomics_add_cascade.sql
new file mode 100644
index 00000000000..b26bb9834f9
--- /dev/null
+++ b/SQL/Archive/2018-03-01_genomics_add_cascade.sql
@@ -0,0 +1,4 @@
+ALTER TABLE genomic_cpg DROP FOREIGN KEY `genomic_cpg_ibfk_1`;
+ALTER TABLE genomic_cpg DROP FOREIGN KEY `genomic_cpg_ibfk_2`;
+ALTER TABLE genomic_cpg ADD CONSTRAINT `genomic_cpg_ibfk_1` FOREIGN KEY (`sample_label`) REFERENCES `genomic_sample_candidate_rel` (`sample_label`) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE genomic_cpg ADD CONSTRAINT `genomic_cpg_ibfk_2` FOREIGN KEY (`cpg_name`) REFERENCES `genomic_cpg_annotation` (`cpg_name`) ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/SQL/Archive/2018-03-02_session_add_cascade.sql b/SQL/Archive/2018-03-02_session_add_cascade.sql
new file mode 100644
index 00000000000..af0945536bf
--- /dev/null
+++ b/SQL/Archive/2018-03-02_session_add_cascade.sql
@@ -0,0 +1,3 @@
+ALTER TABLE parameter_session DROP FOREIGN KEY `FK_parameter_session_1`;
+ALTER TABLE parameter_session ADD CONSTRAINT `FK_parameter_session_1` FOREIGN KEY (`SessionID`) REFERENCES `session` (`ID`) ON DELETE CASCADE ON UPDATE CASCADE
+
diff --git a/SQL/Archive/2018-04-05_remove_if_site_from_imaging_pipeline_in_Config_tables.sql b/SQL/Archive/2018-04-05_remove_if_site_from_imaging_pipeline_in_Config_tables.sql
new file mode 100644
index 00000000000..9d3cb12baf6
--- /dev/null
+++ b/SQL/Archive/2018-04-05_remove_if_site_from_imaging_pipeline_in_Config_tables.sql
@@ -0,0 +1,5 @@
+-- Removing the config setting if_site of the imaging pipeline section as discussed during a LORIS imaging meeting
+DELETE FROM Config WHERE ConfigID=(
+    SELECT ID FROM ConfigSettings WHERE Name='if_site'
+);
+DELETE FROM ConfigSettings WHERE Name='if_site';
diff --git a/SQL/Archive/2018-04-06_Change_no_nii_option_to_create_nii.sql b/SQL/Archive/2018-04-06_Change_no_nii_option_to_create_nii.sql
new file mode 100644
index 00000000000..d6e3a5ebbf6
--- /dev/null
+++ b/SQL/Archive/2018-04-06_Change_no_nii_option_to_create_nii.sql
@@ -0,0 +1,12 @@
+UPDATE ConfigSettings 
+    SET Name="create_nii", 
+        Description="Create NIfTI files if set to 1", 
+        Label="NIfTI file creation" 
+    WHERE Name="no_nii";
+UPDATE Config
+    SET Value=IF(
+        (SELECT Value FROM ConfigSettings cs WHERE cs.Name="create_nii")=0, 1, 0
+    )
+    WHERE ConfigID=(
+        SELECT ID FROM ConfigSettings cs WHERE cs.Name="create_nii"
+    );
diff --git a/SQL/Archive/2018-04-06_ImprovedDescriptionOfLookupCenterNameUsing.sql b/SQL/Archive/2018-04-06_ImprovedDescriptionOfLookupCenterNameUsing.sql
new file mode 100644
index 00000000000..5cdc659e44d
--- /dev/null
+++ b/SQL/Archive/2018-04-06_ImprovedDescriptionOfLookupCenterNameUsing.sql
@@ -0,0 +1,5 @@
+-- Change description and label of the ConfigSetting named lookupCenterNameUsing
+UPDATE ConfigSettings SET
+    Description = "DICOM field (either PatientName or PatientID) to use to get the patient identifiers and the center name of the DICOM study",
+    Label = "Patient identifiers and center name lookup variable"
+    WHERE Name = "lookupCenterNameUsing";
diff --git a/SQL/Archive/2018-04-09_ClarifyingImagingPipelineConfigDescriptions.sql b/SQL/Archive/2018-04-09_ClarifyingImagingPipelineConfigDescriptions.sql
new file mode 100644
index 00000000000..75fc0bee91e
--- /dev/null
+++ b/SQL/Archive/2018-04-09_ClarifyingImagingPipelineConfigDescriptions.sql
@@ -0,0 +1,16 @@
+UPDATE ConfigSettings
+    SET Description='Enable generation of horizontal pictures'
+    WHERE Name='horizontalPics';
+
+UPDATE ConfigSettings
+    SET Description='Enable creation of NIfTI files'
+    WHERE Name="create_nii";
+
+UPDATE ConfigSettings
+    SET Description='Enable candidate creation in the imaging pipeline'
+        WHERE Name='createCandidates';
+
+UPDATE ConfigSettings
+    SET Description='Enable use of batch management in the imaging pipeline'
+        WHERE Name='is_qsub';
+
diff --git a/SQL/Release_patches/19.0_To_19.1_upgrade.sql b/SQL/Release_patches/19.0_To_19.1_upgrade.sql
new file mode 100644
index 00000000000..a5f09ec27cf
--- /dev/null
+++ b/SQL/Release_patches/19.0_To_19.1_upgrade.sql
@@ -0,0 +1,130 @@
+CREATE TABLE `language` (
+  `language_id` integer unsigned NOT NULL AUTO_INCREMENT,
+  `language_code` varchar(255) NOT NULL,
+  `language_label` varchar(255) NOT NULL,
+  PRIMARY KEY (`language_id`),
+  UNIQUE KEY (`language_code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+INSERT INTO language (language_code, language_label) VALUES ('en-CA', 'English');
+
+ALTER TABLE users ADD language_preference integer unsigned DEFAULT NULL;
+ALTER TABLE users ADD CONSTRAINT `FK_users_2` FOREIGN KEY (`language_preference`) REFERENCES `language` (`language_id`);
+
+ALTER TABLE media ADD COLUMN  language_id INT UNSIGNED DEFAULT NULL;
+ALTER TABLE media ADD CONSTRAINT `FK_media_language` FOREIGN KEY (`language_id`) REFERENCES `language` (`language_id`);
+
+-- Disable Foreign key to be able to change type
+-- of FileType to VARCHAR(12) in files,
+-- mri_processing_protocol and ImagingFileType
+SET FOREIGN_KEY_CHECKS=0;
+
+-- ALTER files to drop the FK_files_FileTypes
+ALTER TABLE files
+  MODIFY `FileType` VARCHAR(12);
+
+-- ALTER mri_processing_protocol to drop the
+-- FK_mri_processing_protocol_FileTypes
+ALTER TABLE mri_processing_protocol
+  MODIFY `FileType` VARCHAR(12);
+
+-- ALTER ImagingFileTypes table to add a `description` column
+ALTER TABLE ImagingFileTypes
+  MODIFY `type` VARCHAR(12) NOT NULL,
+  ADD `description` VARCHAR(255) DEFAULT NULL;
+
+-- Re-enable the forein keys
+SET FOREIGN_KEY_CHECKS=1;
+
+-- ADD description to the different type
+UPDATE ImagingFileTypes
+  SET description='MINC file'
+  WHERE type='mnc';
+
+UPDATE ImagingFileTypes
+  SET description='3D imaging format'
+  WHERE type='obj';
+
+UPDATE ImagingFileTypes
+  SET description='transformation matrix file'
+  WHERE type='xfm';
+
+UPDATE ImagingFileTypes
+  SET description=NULL
+  WHERE type='xfmmnc';
+
+UPDATE ImagingFileTypes
+  SET description='audition impulse file'
+  WHERE type='imp';
+
+UPDATE ImagingFileTypes
+  SET description='file describing the cortical thickness in a single column'
+  WHERE type='vertstat';
+
+UPDATE ImagingFileTypes
+  SET description='XML file'
+  WHERE type='xml';
+
+UPDATE ImagingFileTypes
+  SET description='text file'
+  WHERE type='txt';
+
+UPDATE ImagingFileTypes
+  SET description='NIfTI file'
+  WHERE type='nii';
+
+UPDATE ImagingFileTypes
+  SET description='NRRD file format (used by DTIPrep)'
+  WHERE type='nrrd';
+
+INSERT INTO ImagingFileTypes (type, description)
+  VALUES ('grid_0', 'MNI BIC non-linear field for non-linear transformation');
+
+-- DELETE xfmmnc entry as no one understand what it is referring to
+DELETE FROM ImagingFileTypes
+  WHERE type='xfmmnc';
+
+-- MAP .nii.gz file type in files table to .nii and delete .nii
+UPDATE files
+  SET FileType='nii'
+  WHERE FileType='nii.gz';
+DELETE FROM ImagingFileTypes
+  WHERE type='nii.gz';
+
+-- delete .imp (obscure file type not used currently in any project)
+DELETE FROM ImagingFileTypes
+  WHERE type='imp';
+
+-- Add Imaging Browser to Imaging Modules
+INSERT INTO ConfigSettings (Name, Description, Visible, AllowMultiple, DataType, Parent, Label, OrderNumber) SELECT 'ImagingBrowserLinkedInstruments', 'Instruments that the users want to see linked from Imaging Browser', 1, 1, 'instrument', ID, 'Imaging Browser Links to Instruments', 7 FROM ConfigSettings WHERE Name="imaging_modules";
+
+-- Default imaging_browser settings for Linked instruments
+-- This will be the two tables mri_parameter_form and radiology_review; IF they exist in the database
+SET @s1 = (SELECT IF(
+    (SELECT COUNT(*)
+        FROM INFORMATION_SCHEMA.TABLES
+        WHERE table_name = 'mri_parameter_form'
+        AND table_schema = DATABASE()
+    ) > 0,
+    "INSERT INTO Config (ConfigID, Value) SELECT cs.ID, 'mri_parameter_form' FROM ConfigSettings cs WHERE cs.Name='ImagingBrowserLinkedInstruments'",
+    "SELECT 'No. It is therefore not inserted into the Configuration module under Imaging Modules' as 'mri parameter_form table exists?'"
+));
+
+PREPARE stmt1 FROM @s1;
+EXECUTE stmt1;
+DEALLOCATE PREPARE stmt1;
+
+SET @s2 = (SELECT IF(
+    (SELECT COUNT(*)
+        FROM INFORMATION_SCHEMA.TABLES
+        WHERE table_name = 'radiology_review'
+        AND table_schema = DATABASE()
+    ) > 0,
+    "INSERT INTO Config (ConfigID, Value) SELECT cs.ID, 'mri_parameter_form' FROM ConfigSettings cs WHERE cs.Name='ImagingBrowserLinkedInstruments'",
+    "SELECT 'No. It is therefore not inserted into the Configuration module under Imaging Modules' as 'radiology_review table exists?'"
+));
+
+PREPARE stmt2 FROM @s2;
+EXECUTE stmt2;
+DEALLOCATE PREPARE stmt2;
+
diff --git a/docs/API/InstrumentFormat.md b/docs/API/InstrumentFormat.md
index cff8a6372c1..d176bd832e6 100644
--- a/docs/API/InstrumentFormat.md
+++ b/docs/API/InstrumentFormat.md
@@ -45,13 +45,13 @@ Where each key should be interpreted as so:
                         are no restrictions on how to determine the InstrumentVersion,
                         but it SHOULD change with any changes to the instrument object.
 
-                        For instance, if an `InstrumentVersion` of "MyInstrument-V1" exists
+ For instance, if an `InstrumentVersion` of "MyInstrument-V1" exists
                         and the options were changed in a `SelectPageElement` to better match
                         the paper copy of the instrument, the InstrumentVersion of the new
                         version SHOULD be changed to "MyInstrument-V2" or in some other way
                         that could differentiate the instrument objects.
 
-                        The `InstrumentVersion` is a self-contained string which can be interpreted
+ The `InstrumentVersion` is a self-contained string which can be interpreted
                         independently of the `ShortName` or `LongName` of the instrument.
 
 `Meta.InstrumentFormatVersion`: A hardcoded string specifying what version of this spec
@@ -116,9 +116,9 @@ the following format:
 
 ## 2.1: Specific element types
 
-2.1.x describes input related types
-2.2.x describes layout related types
-3.x   describes element group related types.
+2.1.x describes input related types  
+2.2.x describes layout related types  
+3.x   describes element group related types.  
 
 ### 2.1.1: Select Element
 
@@ -151,7 +151,7 @@ as follows. It denotes a group of values of which the user must select one optio
 
 `Options.Values`: REQUIRED. Contains a JSON object specifying the
                 options to be selected. Each key/value corresponds
-                to <option value="JSONKey">JSONValue</option> in an
+                to `<option value="JSONKey">JSONValue</option>` in an
                 HTML implementation. The JSONKey contains the value
                 to be saved if selected, and the JSONValue contains
                 the human friendly text to display to the user.
@@ -192,7 +192,7 @@ save it. The format is as follows:
 }
 ```
 
-`Type`: MUST be "text"
+`Type`: MUST be "text".
 
 `Name`: Required. Follows PageElement.Name rules.
 
@@ -200,9 +200,9 @@ save it. The format is as follows:
 
 `Options.Type`: Either "large" or "small". If "large", the user is meant to enter
               a lot of text (ie. a comment box) and is likely to be represented
-              by a textarea in an HTML implementation.
+              by a `<textarea>` in an HTML implementation.
               If "small" the user is meant to enter a little text and is likely
-              to be implemented by a <input type="text"> in an HTML implementation.
+              to be implemented by a `<input type="text">` in an HTML implementation.
               Default: small
 
 `Options.Regex`: Optional, a regex that the data entered must conform to. If not
@@ -233,7 +233,7 @@ as follows:
 }
 ```
 
-`Type`: MUST be "date"
+`Type`: MUST be "date".
 
 `Name`: Required. Follows `PageElement.Name` rules.
 
@@ -243,7 +243,7 @@ as follows:
 
 `Options.MaxDate`: The maximum date that can be chosen by the user. Format is YYYY-MM-DD
 
-`Options.RequireResponse`: Follows the same rules as TextElement:Options.RequireResponse
+`Options.RequireResponse`: Follows the same rules as TextElement:Options.RequireResponse.
 
 
 
@@ -276,14 +276,14 @@ A NumericElement represents a numeric data input and has the general form of:
 
 `Options.MinValue`: A number representing the minimum value that can be chosen
                   by the user. May be a decimal if "NumberType" is decimal, and
-                  an integer if "NumberType" is integer
+                  an integer if "NumberType" is integer.
 
 `Options.MaxValue`: A number representing the maximum value that the user can select.
                   Type of number depends on "NumberType" value. If both MinValue and
                   MaxValue are specified MaxValue MUST be greater than or equal to
                   MinValue.
 
-`Options.RequireResponse`: Follows the same rules as TextElement:Options.RequireResponse
+`Options.RequireResponse`: Follows the same rules as TextElement:Options.RequireResponse.
 
 
 
@@ -338,9 +338,9 @@ may be used by an instrument.
 }
 ```
 
-`Type`: MUST be "header"
+`Type`: MUST be "header".
 
-`Description`: Required. The text to display in the header
+`Description`: Required. The text to display in the header.
 
 `Options.Level`: The level of the header. 1 is the most prominent and subheaders (or sub-subheaders, or
                sub-sub-sub-headers) get increasingly high levels.
@@ -364,11 +364,11 @@ input. It has the following form:
 }
 ```
 
-`Type`: MUST be "label"
+`Type`: MUST be "label".
 
 `Description`: Required. The text to display in the label.
 
-`Options`: None
+`Options`: None.
 
 # 3.0.0: ElementGroups
 
@@ -385,7 +385,7 @@ Groups have the general form of:
 }
 ```
 
-`Type`: MUST be "ElementGroup",
+`Type`: MUST be "ElementGroup".
 
 `GroupType`: must be one of the types defined in section 3 of this documents.
 
@@ -401,8 +401,8 @@ has the following form:
 
 ```js
 {
-    "Type"      : "ElementGroup"
-    "GroupType" : "Page"
+    "Type"      : "ElementGroup",
+    "GroupType" : "Page",
     "Elements"  : [ /* Array of elements of any element or group type defined in this document */],
     "Description" : OPTIONAL
 }
@@ -410,9 +410,9 @@ has the following form:
 
 Any element that it not part of a Page group will be placed on a default top level page.
 
-`Type`: MUST be "ElementGroup",
+`Type`: MUST be "ElementGroup".
 
-`GroupType`: MUST be "Page"
+`GroupType`: MUST be "Page".
 
 `Elements`: May be of any type except with the exception that a Page MUST NOT have further
             Page groups embedded into the Page.
@@ -433,14 +433,14 @@ Element groups have the form:
 ```js
 {
     "Type"      : "ElementGroup",
-    "GroupType" : "Element"
+    "GroupType" : "Element",
     "Elements"  : [ /* Array of elements defined in section 2 of this document */]
 }
 ```
 
-`Type`: MUST be "ElementGroup",
+`Type`: MUST be "ElementGroup".
 
-`GroupType`: MUST be "Element"
+`GroupType`: MUST be "Element".
 
 `Elements`: May be any element type defined in section 2, but MUST NOT contain further
             subgroups.
@@ -462,9 +462,9 @@ to grow smaller rows to the size of the biggest row.
 }
 ```
 
-`Type`: MUST be "ElementGroup",
+`Type`: MUST be "ElementGroup".
 
-`GroupType`: MUST be "Table"
+`GroupType`: MUST be "Table".
 
 `Elements`: MUST only contain Row groups.
 
@@ -488,8 +488,8 @@ of type "header" into the row group.
 }
 ```
 
-`Type`: MUST be "ElementGroup",
+`Type`: MUST be "ElementGroup".
 
-`GroupType`: MUST be "Row"
+`GroupType`: MUST be "Row".
 
 `Elements`: May contain any standard element type from section 2.
diff --git a/docs/API/LorisRESTAPI.md b/docs/API/LorisRESTAPI.md
index a4a0f532faa..aa53afdec44 100644
--- a/docs/API/LorisRESTAPI.md
+++ b/docs/API/LorisRESTAPI.md
@@ -37,7 +37,7 @@ no further authentication is required. Requests will be evaluated as requests fr
 so that standard Loris modules can simply use the API.
 
 If a user is not logged in to Loris (for instance, in a third party app or a CORS application),
-they can be be authenticated using [JSON Web Tokens](https://jwt.io).
+they can be authenticated using [JSON Web Tokens](https://jwt.io).
 
 The client should POST a request to /login with a payload of the form
 
diff --git a/docs/API/LorisRESTAPI_v0.0.3.md b/docs/API/LorisRESTAPI_v0.0.3.md
new file mode 100644
index 00000000000..0a2fb717279
--- /dev/null
+++ b/docs/API/LorisRESTAPI_v0.0.3.md
@@ -0,0 +1,735 @@
+# Loris API - v0.0.3-dev
+
+## 1.0 Overview
+
+This document specifies the Loris REST API.
+
+Any request sent to `$LorisRoot/api/$APIVERSION/$API_CALL` will return either a JSON object
+or no data. The Loris API uses standard HTTP error codes and the body of any response will
+either be empty or contain only a JSON object for any request.
+
+For brevity, the `$LorisRoot/api/$APIVERSION` is omitted from the definitions in this
+document. This document specifies $APIVERSION v0.0.3-dev and it
+MUST be included before the request in all requests.
+
+HTTP GET requests NEVER modify data. PUT, POST or PATCH requests MUST be used to modify
+data as per their definitions in the HTTP/1.1 specification. Any methods not supported
+will respond with a 405 Method Not Allowed response and an appropriate Allow header set (as
+per HTTP documentation.)
+
+PUT requests either create or overwrite all data for a given resource (instrument/
+candidate/visit/etc.) Any fields not explicitly specified in the PUT request are nulled.
+
+PATCH requests are identical to PUT requests, but any fields not explicitly mentioned are
+unmodified from their current value.
+
+All GET requests include an ETag header. If a PUT or PATCH request is sent and it does
+not include an ETag, or the ETag does not match the currently existing ETag for that resource,
+it will result in a 403 Forbidden response. PUT or POST requests used for the creation of resources
+do not require ETags.
+
+DELETE is not supported on any resource defined in this API.
+
+# 1.1 Authentication
+
+If a user is logged in to Loris and can be authenticated using the standard session mechanism,
+no further authentication is required. Requests will be evaluated as requests from that user,
+so that standard Loris modules can simply use the API.
+
+If a user is not logged in to Loris (for instance, in a third party app or a CORS application),
+they can be authenticated using [JSON Web Tokens](https://jwt.io).
+
+The client should POST a request to /login with a payload of the form:
+
+```js
+{
+    "username" : username,
+    "password" : password
+}
+```
+
+If the username and password are valid, the API will respond with a 200 OK and payload
+of the form:
+
+```js
+{
+    "token" : /* JWT token */
+}
+```
+
+Otherwise, it will return a 401 Unauthorized response.
+
+If the token is returned, it should be included in an "Authorization: Bearer token" header
+for any future requests to authenciate the request.
+
+# 2.0 Project API
+
+The Project API lives under the /projects portion of the API URL hierarchy. It is used to get
+project specific settings or data. PUT and PATCH are not currently supported for the part of
+the API living under /projects.
+
+```
+GET /projects
+```
+
+Will return a list of projects in this Loris instance. There is no corresponding PUT or PATCH
+request. The JSON returned is of the form:
+
+```js
+{
+    "Projects" : {
+        "ProjectName1" : {
+            "useEDC" : boolean,
+            "PSCID" : PSCIDSettings
+        },
+        "ProjectName2" : {
+            "useEDC" : boolean,
+            "PSCID" : PSCIDSettings
+        },
+        ...
+}
+```
+
+If the Loris instance does not use projects, the API will return a single project called "loris"
+with the appropriate settings for the Loris instance.
+
+useEDC represents a boolean determining whether the EDC date should be included
+in candidates returned by the API.
+
+PSCID represents a JSON object with the configuration settings for PSCIDs in this
+project.
+
+It has the form:
+
+```js
+{
+    "Type" : "prompt|auto",
+    "Regex" : "/regex/"
+}
+```
+
+Where regex is a regular expression that can be used to validate a PSCID for this project.
+
+If the type is "prompt", the user should be prompted to enter the PSCID for new candidates.
+If the type is "auto", the server will automatically generate the PSCID.
+
+Note that sometimes in Loris configurations "Site" is a part of the PSCID. This will be
+denoted by the string "SITE{1,1}" inside of the regex returned. This string should be replaced
+by the 3 letter site alias before attempting to pass this regex to a regular expression parser
+or it will result in false negatives.
+
+
+## 2.1 Single project 
+
+```
+GET /projects/$ProjectName
+```
+
+Returns a 200 OK response if the project exists, and 404 Not Found if it does not (the same is
+true of any portion of the API under /projects/$ProjectName.)
+
+The body of the request to /projects/$ProjectName will be an entity of the form:
+
+```js
+{
+    "Meta" : {
+        "Project" : "ProjectName"
+    },
+    "Visits" : ["V1", "V2", ... ],
+    "Instruments" : ["InstrumentName", "InstrumentName2", ...],
+    "Candidates" : ["123543", "523234", ...]
+}
+```
+
+### 2.1.1 Single project images  
+```
+GET /projects/$ProjectName/images/
+```
+
+Will return a JSON object of the form:
+
+```js
+{
+  "Images" : [
+    {
+      "Candidate": "123456",
+      "PSCID": "MTL001",
+      "Visit": "V1",
+      "Visit_date": "2016-08-09", /* The date of the session. This will be null for phantoms and session that are not yet started */
+      "Site": "Montreal Neurological Institute",
+      "ScanType": "t2", /* Acquisition protocol */
+      "QC_status": "Pass|Fail|null",
+      "Selected": "true|false|null",
+      "Link": "\/candidates\/300022\/V1\/images\/loris-MRI_123456_V1_t2_001.mnc", /* URL relative to this API */
+      "InsertTime": "2016-08-09T14:15:30-05:00" /* The inserted date ISO 8601 */
+    },
+    ...
+  ]
+}
+```
+It is possible to provide a GET parameter named `since` where the value need to be a date or datetime.
+```
+ex: 2016-08-09 or 2016-08-09 10:00:00 or 2016-08-09T10:00:00-05:00
+```
+We recommend using a format that includes timezone.
+
+### 2.1.2 Single project instruments  
+```
+GET /projects/$ProjectName/instruments/
+```
+
+Will return a JSON object of the form:
+
+```js
+{
+    "Meta" : {
+        "Project" : "ProjectName"
+    },
+    "Instruments": {
+        "InstrumentName" : {
+            "FullName" :  "Long Name",
+            "Subgroup" : "Subgroup Name",
+            "DoubleDataEntryEnabled" : boolean
+        },
+        "Instrument2" : {
+            "FullName" :  "Long Name",
+            "Subgroup" : "Subgroup Name",
+            "DoubleDataEntryEnabled" : boolean
+        },
+        ...
+    }
+}
+```
+
+Where the InstrumentNames are the "Short Name" of all the instruments used/installed in this project.
+
+### 2.1.3 Single project visits  
+```
+GET /projects/$ProjectName/visits/
+```
+
+Will return a JSON object of the form:
+
+```js
+{
+    "Meta" : {
+        "Project" : "ProjectName"
+    },
+    "Visits" : ["V1", "V2", ... ],
+}
+```
+
+Where V1, V2, ... are the visits that may exist for this project
+
+### 2.1.3 Single project candidates  
+```
+GET /projects/$ProjectName/candidates/
+```
+
+will return a JSON object of the form:
+
+```js
+{
+    "Meta" : {
+        "Project" : "ProjectName"
+    },
+    "Candidates" : ["123456", "342332", ... ],
+}
+```
+
+where 123456, 342332, etc are the candidates that exist for this project.
+
+## 2.2 Instrument Forms
+
+```
+GET /projects/$ProjectName/instruments/$InstrumentName
+```
+
+Will return a 200 response on success and 404 Not Found if $InstrumentName is not a
+valid instrument for this instance of Loris.
+
+This will return a JSON representation of the instrument form. If available, rules and form will
+be combined into a single JSON object. The format for the JSON returned is specified in the
+accompanying InstrumentFormat.md and RulesFormat.md documents. The JSON document can be used
+to render the form by a client.
+
+PUT and PATCH are not supported for instrument forms.
+
+Methods for getting/putting data into specific candidates are specified in section 3.
+
+# 3.0 Candidate API
+
+The /candidate portion of the API is used for retrieving and modifying candidate data and
+data attached to a specific candidate or visit such as visits or instrument data. Portions
+of this reference a CandidateObject. A CandidateObject is a JSON object of the form:
+
+```js
+{
+        "CandID"  : CandID,
+        "Project" : ProjectName,
+        "PSCID"   : PSCID,
+        "Site"    : Site,
+        "EDC"     : "YYYY-MM-DD",
+        "DoB"     : "YYYY-MM-DD",
+        "Gender"  : "Male|Female"
+}
+```
+
+representing a candidate in Loris.
+
+```
+GET /candidates/
+```
+
+will return a JSON object of the form:
+
+```js
+{
+    "Candidates" : [CandidateObject1, CandidateObject2, CandidateObject3, ...]
+}
+```
+
+containing ALL candidates present in this Loris instance.
+
+A new candidate can be created by sending a POST request to /candidates.
+
+The body of the POST request should be a candidate key with a JSON object of the form:
+
+```js
+{
+    "Candidate" : {
+        "Project" : ProjectName,
+        "PSCID"   : PSCID,
+        "EDC"     : "YYYY-MM-DD",
+        "DoB"     : "YYYY-MM-DD",
+        "Gender"  : "Male|Female"
+    }
+}
+```
+
+EDC is only required if useEDC is enabled for the project according to the
+project settings.
+
+PSCID is only required if the generation type in the Loris config is set to
+"prompt".
+
+The candidate will be created at the site of the user using the API's site.
+A response code of 201 Created will be returned on success, 409 Conflict if
+the PSCID already exists, and a 400 Bad Request if any data provided is invalid
+(PSCID format, date format, gender something other than Male|Female, invalid project
+name, etc). A successful POST request will return the CandID for the newly
+created candidate.
+
+PUT / PATCH methods are not supported on /candidate in this
+version of the Loris API.
+
+# 3.1 Specific Candidate
+
+If a GET request for a candidate is issued such as
+
+```
+GET /candidates/$CandID
+```
+
+A JSON object representing that candidate will be returned.
+
+The JSON object is of the form:
+
+```js
+{
+    "Meta" : CandidateObject,
+    "Visits" : ["V1", "V2", ...]
+}
+```
+
+where V1, V2, etc are the visit labels that are registered for this
+candidate.
+
+PUT / PATCH are not supported for candidates in this version of the
+API.
+
+It will return a 200 OK on success, a 404 if the candidate does not exist, and
+a 400 Bad Request if the CandID is invalid (not a 6 digit integer). The same is
+true of all of the API hierarchy under /candidates/$CandID.
+
+### 3.2 Getting Candidate visit data
+
+A GET request of the form:
+
+```
+GET /candidates/$CandID/$VisitLabel
+```
+
+Will return a JSON object of the metadata for that candidate's visit.
+
+The JSON object is of the form:
+
+```js
+{
+    "Meta" : {
+        "CandID" : CandID,
+        "Visit"  : VisitLabel,
+        "Battery" : "NameOfSubproject"
+    },
+    "Stages" : {
+        "Screening" :  {
+            "Date" : "YYYY-MM-DD",
+            "Status" : "Pass|Failure|Withdrawal|In Progress"
+        },
+        "Visit" : {
+            "Date" : "YYYY-MM-DD",
+            "Status" : "Pass|Failure|Withdrawal|In Progress"
+        },
+        "Approval" : {
+            "Date" : "YYYY-MM-DD",
+            "Status" : "Pass|Failure|Withdrawal|In Progress"
+        }
+    }
+}
+```
+
+A PUT of the same format but with only the Meta fields will create the VisitLabel
+for this candidate, in an unstarted stage if the Visit label provided is valid.
+
+PATCH is not supported for Visit Labels.
+
+It will return a 404 Not Found if the visit label does not exist for this candidate
+(as well as anything under the /candidates/$CandID/$VisitLabel hierarchy)
+
+Any of the Stages may not be present in the returned result if the stage has not
+started yet or is not enabled for this project (ie. if useScreening is false in
+Loris, or Approval has not occured)
+
+### 3.3 Candidate Instruments
+```
+GET /candidates/$CandID/$VisitLabel/instruments
+```
+
+Will return a JSON object of the form:
+
+```js
+{
+    "Meta" : {
+        "CandID" : CandID,
+        "Visit"  : VisitLabel
+    },
+    "Instruments" : [ "InstrumentName", "AnotherInstrument", ...]
+}
+```
+
+Where the instruments array represents the instruments that were administered for that
+candidate at that visit. InstrumentNames are the short names and the forms for them
+SHOULD all be retrievable through the `project` portion of the API.
+
+PUT / PATCH / POST are not currently supported for candidate instruments.
+
+### 3.3 The Candidate Instrument Data
+
+```
+GET /candidates/$CandID/$VisitLabel/instruments/$InstrumentName[/dde]
+PUT /candidates/$CandID/$VisitLabel/instruments/$InstrumentName[/dde]
+PATCH /candidates/$CandID/$VisitLabel/instruments/$InstrumentName[/dde]
+```
+
+These will retrieve or modifiy the data for $InstrumentName. If /dde is present, the double data
+entry form of the data will be retrieved/modified. If absent, the "single data entry" version
+of the form is used instead.
+
+The format returned by a GET request is a JSON document of the form:
+
+```js
+{
+    "Meta" : {
+        "Instrument" : $InstrumentName,
+        "Visit" : $VisitLabel,
+        "Candidate" : $CandID,
+        "DDE" : boolean
+    },
+    "$InstrumentName" : {
+        "FieldName1" : "Value1",
+        "FieldName2" : "Value2",
+        ...
+    }
+}
+```
+
+Including the values of ALL fields for this instrument, including score field values.
+
+The body of a PUT request to the same URL MUST contain a JSON object of the same format. Data PUT
+to the URL SHOULD contain all fields with data entry. The server will null the data for keys not
+specified. A PUT request MAY not specify score columns that will be calculated/overwriten by
+server-side scoring. If the client attempted to score fields client-side and the value passed by the PUT
+request conflict with the server-side calculation of the score, the server-side calculation will win.
+Any keys specified in the document PUT that do not match a corresponding field in the form MAY be ignored.
+
+The specification for PATCH request is similar to a PUT request, with the exception that any
+fields not specified MUST be unmodified by the server rather than nulled. In most cases a series
+of PATCH requests SHOULD be used rather than a single PUT request for a client with pagination.
+
+A 200 OK will be returned on success, and a 404 Not Found if $InstrumentName is not a valid instrument installed in this Loris instance.
+
+### 3.3.1 Instrument flags
+```
+GET /candidates/$CandID/$VisitLabel/instruments/$InstrumentName[/dde]/flags
+PUT /candidates/$CandID/$VisitLabel/instruments/$InstrumentName[/dde]/flags
+PATCH /candidates/$CandID/$VisitLabel/instruments/$InstrumentName[/dde]/flags
+```
+
+This URL is used to GET and modify flags for an instrument. The standard GET/PUT/PATCH
+rules apply. However, PATCH and PUT requests MUST include the "Meta" attribute and all
+fields in it MUST be specified and match the values in the URL, otherwise a "400 Bad request"
+error is returned and no data is modified. Like instruments, the [/dde] component is optional
+and used to differentiate single data entry and double data entry flags.
+
+The "Validity" flag may be missing, if the ValidityEnabled flag is not true for this instrument.
+
+The format of the JSON object for these URLS is:
+
+```js
+{
+    "Meta" : {
+        "Candidate"  : CandID,
+        "Visit"      : VisitLabel,
+        "Instrument" : InstrumentName,
+        "DDE"        : boolean
+    },
+    "Flags" : {
+        "Data_entry" : "In Progress|Complete",
+        "Administration" : "None|Partial|All",
+        "Validity" : "Questionable|Invalid|Valid"
+    }
+}
+```
+
+# 4.0 Imaging Data
+
+The imaging data mostly lives in the `/candidates/$CandID/$Visit` portion of the REST API
+namespaces, but is defined in a separate section of this document for clarity purposes.
+
+## 4.1 Candidate Images
+```
+GET /candidates/$CandID/$Visit/images
+```
+
+A GET request to `/candidates/$CandID/$Visit/images` will return a JSON object of
+all the images which have been acquired for that visit. It will return an object of
+the form:
+
+```js
+{
+    "Meta" : {
+        "CandID" : $CandID,
+        "Visit" : $VisitLabel,
+    },
+    "Files" : [{
+        "OutputType" : "native",
+        "Filename" : "abc.mnc",
+        "AcquisitionType" : "t1w/t2w/etc",
+    }, /* More files */]
+}
+```
+
+## 4.2 Session Imaging QC
+```
+GET /candidates/$CandID/$Visit/qc/imaging
+PUT /candidates/$CandID/$Visit/qc/imaging
+```
+
+To retrieve the session level imaging QC data for a visit, a request can
+be made `/candidates/$CandID/$Visit/qc/imaging`. It will return a JSON object
+of the form:
+
+```js
+{
+    "Meta" : {
+        "CandID" : $CandID,
+        "Visit" : $VisitLabel
+    },
+   "SessionQC" : "Pass|Fail"
+   "Pending" : boolean
+}
+```
+
+A PUT to the same location will update the QC information. 
+
+## 4.3 Image Level Data
+```
+GET /candidates/$CandID/$VisitLabel/images/$Filename
+```
+
+Returns raw file with the appropriate MimeType headers for each Filename retrieved from
+`/candidates/$CandID/$Visit/images`.
+
+Only `GET` is currently supported, but future versions of this API may include `PUT`
+support to insert new (or processed) data into LORIS.
+
+## 4.3.1 Image Level QC Data
+```
+GET /candidates/$CandID/$VisitLabel/images/$Filename/qc
+PUT /candidates/$CandID/$VisitLabel/images/$Filename/qc
+```
+
+Returns file level QC information. It will return a JSON object of the form:
+
+```js
+{
+    "Meta" : {
+        "CandID" : $CandID,
+        "Visit" : $VisitLabel,
+        "File" : $Filename
+    },
+    "QC" : "Pass|Fail",
+    "Selected" : boolean
+}
+```
+
+`PUT` requests to the same URL will update the QC information.
+
+## 4.4 Alternate formats
+
+There are occasions where you may want to retrieve a file in a different format
+than it is stored in LORIS. This can be achieved by adding `/format/$FormatType`
+to the URL in the API. Currently supported other formats are below. Other formats
+may be added in a future version of this API.
+
+An attempt to convert an image to an unsupported format may result in a
+ `415 Unsupported Media Type` HTTP error.
+
+### 4.4.1 Raw Format
+```
+GET /candidates/$CandID/$VisitLabel/images/$Filename/format/raw
+```
+
+This will return the data in raw format (ie. the output of mnc2raw)
+
+### 4.4.2 BrainBrowser Format
+```
+GET /candidates/$CandID/$VisitLabel/images/$Filename/format/brainbrowser
+```
+
+This (in combination with raw) will let you extract the headers in a JSON
+format that BrainBrowser can load. It will return a JSON object of the format
+
+```js
+{
+    "xspace": {
+        "start":"",
+        "space_length":"",
+        "step":""},
+    "yspace": {
+        "start":"",
+        "space_length":"",
+        "step":""
+    },
+    "zspace": {
+        "start":"",
+        "space_length":"",
+        "step":""
+    },
+    "order":["xspace","zspace","yspace"]
+}
+```
+
+### 4.4.3 Thumbnail Format
+```
+GET /candidates/$CandID/$VisitLabel/images/$Filename/format/thumbnail
+```
+
+This will return a JPEG image that can be used as a thumbnail to represent this
+imaging acquisition statically (such as in the LORIS imaging browser.)
+
+### 4.5 Image Headers
+The LORIS API allows you to extract headers from the images in a RESTful manner.
+The following methods are defined:
+
+### 4.5.1 Header Summary
+```
+GET /candidates/$CandID/$VisitLabel/images/$Filename/headers
+```
+
+This will return a JSON summary of the important headers for this filename. It
+will return a JSON object of the form:
+
+```js
+{
+    "Meta" : {
+        "CandID" : $CandID,
+        "Visit" : $VisitLabel,
+        "File" : $Filename
+    },
+    "Physical" : {
+        "TE" : "",
+        "TR" : "",
+        "TI" : "",
+        "SliceThickness" : "",
+    },
+    "Description" : {
+        "SeriesName" : "",
+        "SeriesDescription"  : ""
+    }
+    "Dimensions" : {
+        "XSpace" : {
+            "Length" : "",
+            "StepSize" : ""
+        },
+        "YSpace" : {
+            "Length" : "",
+            "StepSize" : ""
+        },
+        "ZSpace" : {
+            "Length" : "",
+            "StepSize" : ""
+        },
+        "TimeDimension" : {
+            "Length" : "",
+            "StepSize" : ""
+        }
+    }
+}
+```
+
+All of the dimensions are optional and may not exist for any given
+file (for instance, a 3D image will not have a time dimension.)
+
+### 4.5.2 Complete Headers
+```
+GET /candidates/$CandID/$VisitLabel/images/$Filename/headers/full
+```
+
+This will return a JSON object with ALL headers for this acquisition. 
+
+The JSON will be of the form:
+
+```js
+{
+    "Meta" : {
+        "CandID" : $CandID,
+        "Visit" : $VisitLabel,
+        "File" : $Filename
+    },
+    "Headers" : {
+        "dicomheader" : "value",
+        /* more headers ... */
+    }
+}
+```
+
+### 4.5.3 Specific Header
+```
+GET /candidates/$CandID/$VisitLabel/images/$Filename/headers/$HeaderName
+```
+
+This will return a JSON object that extracts one specific header from $Filename.
+
+The JSON object is of the form:
+```js
+{
+    "Meta" : {
+        "CandID" : $CandID,
+        "Visit" : $VisitLabel,
+        "File" : $Filename,
+        "Header" : $HeaderName
+    },
+    "Value" : string
+}
+```
diff --git a/docs/config/config.xml b/docs/config/config.xml
index c32d4d8332b..af21218ceaf 100644
--- a/docs/config/config.xml
+++ b/docs/config/config.xml
@@ -60,28 +60,12 @@
         </HeaderTable>
         <!-- defines how visit labels are assigned -->
         <visitLabel subprojectID="1">
-            <!-- generation can have either 'user' or 'sequence' to denote user entered or a pre-defined sequence -->
-            <!-- if 'user', the frontend will display a textbox for the user to enter date which is
-                 enforced against the regex. If 'sequence', a dropdown will be displayed
-                 based on the options in the labelSet tag -->
-            <generation>user</generation>
-            <regex>/^[A-Z0-9]{2}$/i</regex>
-            <length>2</length>
-            <suggest>V%value%</suggest> <!-- %value% will be substituted for the next unique number -->
             <labelSet>
                 <item value="V01">V01</item>
                 <item value="V02">V02</item>
             </labelSet>
         </visitLabel>
         <visitLabel subprojectID="2">
-            <!-- generation can have either 'user' or 'sequence' to denote user entered or a pre-defined sequence -->
-            <!-- if 'user', the frontend will display a textbox for the user to enter date which is
-                 enforced against the regex. If 'sequence', a dropdown will be displayed
-                 based on the options in the labelSet tag -->
-            <generation>user</generation>
-            <regex>/^[A-Z0-9]{2}$/i</regex>
-            <length>2</length>
-            <suggest>V%value%</suggest> <!-- %value% will be substituted for the next unique number -->
             <labelSet>
                 <item value="V01">V01</item>
                 <item value="V02">V02</item>
diff --git a/htdocs/.htaccess b/htdocs/.htaccess
index 5732bd36006..c0716640a2c 100644
--- a/htdocs/.htaccess
+++ b/htdocs/.htaccess
@@ -15,6 +15,5 @@ RewriteRule ^([a-zA-Z0-9_-]+)reliability([a-zA-Z0-9_-]*) main.php?test_name=$1re
 # directly from apache
 RewriteCond "%{REQUEST_FILENAME}" "!-f"
 RewriteRule ^(.*)$ index.php?lorispath=$1 [QSA,L]
-
 </IfModule>
 
diff --git a/htdocs/api/v0.0.1/Login.php b/htdocs/api/v0.0.1/Login.php
index b4f4f7594a7..da1e2079534 100644
--- a/htdocs/api/v0.0.1/Login.php
+++ b/htdocs/api/v0.0.1/Login.php
@@ -149,11 +149,11 @@ function getEncodedToken($user)
      * Since this isn't a real resource, it just returns the
      * empty string.
      *
-     * @return empty string
+     * @return string
      */
     function calculateETag()
     {
-        return;
+        return "";
     }
 
     /**
diff --git a/htdocs/api/v0.0.2/Login.php b/htdocs/api/v0.0.2/Login.php
index ec6f3102e4f..f1cde7b39c9 100644
--- a/htdocs/api/v0.0.2/Login.php
+++ b/htdocs/api/v0.0.2/Login.php
@@ -149,11 +149,11 @@ function getEncodedToken($user)
      * Since this isn't a real resource, it just returns the
      * empty string.
      *
-     * @return empty string
+     * @return string
      */
     function calculateETag()
     {
-        return;
+        return "";
     }
 
     /**
diff --git a/htdocs/api/v0.0.2/projects/Project.php b/htdocs/api/v0.0.2/projects/Project.php
index 6b87773c521..cc0ebc47fcb 100644
--- a/htdocs/api/v0.0.2/projects/Project.php
+++ b/htdocs/api/v0.0.2/projects/Project.php
@@ -85,12 +85,12 @@ public function __construct(
     /**
      * Handles a GET request for a project data
      *
-     * @return none but populates $this->JSON
+     * @return void
      */
     function handleGET()
     {
         if (!empty($this->JSON)) {
-            return $this->JSON;
+            return;
         }
         $JSONArray = [
                       "Meta" => [
diff --git a/htdocs/api/v0.0.3-dev/.htaccess b/htdocs/api/v0.0.3-dev/.htaccess
new file mode 100644
index 00000000000..53439dfd9d9
--- /dev/null
+++ b/htdocs/api/v0.0.3-dev/.htaccess
@@ -0,0 +1,42 @@
+Header always set Access-Control-Allow-Origin "*"
+Header always set Access-Control-Allow-Headers "*"
+RewriteEngine on
+Options -Indexes
+
+# pass-through if another rewrite rule has been applied already
+RewriteCond %{ENV:REDIRECT_STATUS} 200
+RewriteRule ^ - [L]
+
+RewriteRule ^login Login.php?PrintLogin=true [L]
+# Projects API rewrite rules
+RewriteRule ^projects/([a-zA-Z0-9_\w\s.]+)/instruments/([a-zA-Z0-9_.]+)$ projects/InstrumentForm.php?Instrument=$2&PrintInstrumentForm=true [L]
+RewriteRule ^projects/([a-zA-Z0-9_\w\s.]+)/visits(/*)$ projects/Project.php?Project=$1&Visits=true&PrintProjectJSON=true [L]
+RewriteRule ^projects/([a-zA-Z0-9_\w\s.]+)/candidates(/*)$ projects/Project.php?Project=$1&Candidates=true&PrintProjectJSON=true [L]
+RewriteRule ^projects/([a-zA-Z0-9_\w\s.]+)/instruments(/*)$ projects/Project.php?Project=$1&Instruments=true&PrintProjectJSON=true&InstrumentDetails=true [L]
+RewriteRule ^projects/([a-zA-Z0-9_\w\s.]+)/images(/*)$ projects/Images.php?project_name=$1 [QSA,L]
+RewriteRule ^projects/([a-zA-Z0-9_\w\s.]+)(/*)$ projects/Project.php?Project=$1&Instruments=true&Visits=true&Candidates=true&PrintProjectJSON=true [L]
+
+RewriteRule ^projects(/*)$ Projects.php?PrintProjects=true [L]
+
+# Candidates API rewrite rules
+
+RewriteRule ^candidates(/*)$ Candidates.php?PrintCandidates=true [L]
+RewriteRule ^candidates/([0-9]+)(/*)$ candidates/Candidate.php?CandID=$1&PrintCandidate=true [L]
+RewriteRule ^candidates/([0-9]+)/([a-zA-Z0-9_.]+)(/*)$ candidates/Visit.php?CandID=$1&VisitLabel=$2&PrintVisit=true [L]
+RewriteRule ^candidates/([0-9]+)/([a-zA-Z0-9_.]+)/instruments$ candidates/Instruments.php?CandID=$1&VisitLabel=$2&NoCandidate=true&PrintInstruments=true [L]
+RewriteRule ^candidates/([0-9]+)/([a-zA-Z0-9_.]+)/instruments/([a-zA-Z0-9_.]+)$ candidates/InstrumentData.php?Instrument=$3&Visit=$2&CandID=$1&PrintInstrumentData=true [L]
+RewriteRule ^candidates/([0-9]+)/([a-zA-Z0-9_.]+)/instruments/([a-zA-Z0-9_.]+)/dde$ candidates/InstrumentData.php?Instrument=$3&Visit=$2&CandID=$1&DDE=true&PrintInstrumentData=true [L]
+RewriteRule ^candidates/([0-9]+)/([a-zA-Z0-9_.]+)/instruments/([a-zA-Z0-9_.]+)/flags$ candidates/InstrumentData.php?Instrument=$3&Visit=$2&CandID=$1&flags=true&PrintInstrumentData=true [L]
+RewriteRule ^candidates/([0-9]+)/([a-zA-Z0-9_.]+)/instruments/([a-zA-Z0-9_.]+)/dde/flags$ candidates/InstrumentData.php?Instrument=$3&Visit=$2&CandID=$1&DDE=true&flags=true&PrintInstrumentData=true [L]
+
+## Imaging API related URLs
+RewriteRule ^candidates/([0-9]+)/([a-zA-Z0-9_.]+)/images$ candidates/visits/Images.php?CandID=$1&VisitLabel=$2&PrintImages=true [L]
+RewriteRule ^candidates/([0-9]+)/([a-zA-Z0-9_.]+)/qc/imaging$ candidates/visits/qc/Imaging.php?CandID=$1&VisitLabel=$2&PrintQC=true [L]
+RewriteRule ^candidates/([0-9]+)/([a-zA-Z0-9_.]+)/images/([a-zA-Z0-9_.]+)/qc$ candidates/visits/images/qc/Qc.php?CandID=$1&VisitLabel=$2&Filename=$3&PrintImageQC=true [L]
+RewriteRule ^candidates/([0-9]+)/([a-zA-Z0-9_.]+)/images/([a-zA-Z0-9_.]+)/format/raw$ candidates/visits/images/format/Raw.php?CandID=$1&VisitLabel=$2&Filename=$3&PrintRawFormat=true [L]
+RewriteRule ^candidates/([0-9]+)/([a-zA-Z0-9_.]+)/images/([a-zA-Z0-9_.]+)/format/thumbnail$ candidates/visits/images/format/Thumbnail.php?CandID=$1&VisitLabel=$2&Filename=$3&PrintThumbnailFormat=true [L]
+RewriteRule ^candidates/([0-9]+)/([a-zA-Z0-9_.]+)/images/([a-zA-Z0-9_.]+)$ candidates/visits/images/Image.php?CandID=$1&VisitLabel=$2&Filename=$3&PrintImageData=true [L]
+RewriteRule ^candidates/([0-9]+)/([a-zA-Z0-9_.]+)/images/([a-zA-Z0-9_.]+)/headers$ candidates/visits/images/headers/Headers.php?CandID=$1&VisitLabel=$2&Filename=$3&PrintHeadersSummary=true [L]
+RewriteRule ^candidates/([0-9]+)/([a-zA-Z0-9_.]+)/images/([a-zA-Z0-9_.]+)/headers/full$ candidates/visits/images/headers/Full.php?CandID=$1&VisitLabel=$2&Filename=$3&PrintHeadersFull=true [L]
+RewriteRule ^candidates/([0-9]+)/([a-zA-Z0-9_.]+)/images/([a-zA-Z0-9_.]+)/headers/(.*)$ candidates/visits/images/headers/Specific.php?CandID=$1&VisitLabel=$2&Filename=$3&Header=$4&PrintSpecificHeader=true [L]
+RewriteRule ^candidates/([0-9]+)/([a-zA-Z0-9_.]+)/images/([a-zA-Z0-9_.]+)$ candidates/visits/images/Image.php?CandID=$1&VisitLabel=$2&Filename=$3&PrintImageData=true [L]
diff --git a/htdocs/api/v0.0.3-dev/APIBase.php b/htdocs/api/v0.0.3-dev/APIBase.php
new file mode 100644
index 00000000000..2870f2359b1
--- /dev/null
+++ b/htdocs/api/v0.0.3-dev/APIBase.php
@@ -0,0 +1,266 @@
+<?php
+/**
+ * Base class to handle requests to the Loris API and perform
+ * validation common to all API requests.
+ *
+ * PHP Version 5.5+
+ *
+ * @category Main
+ * @package  API
+ * @author   Dave MacFarlane <david.macfarlane2@mcgill.ca>
+ * @license  http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link     https://www.github.com/aces/Loris/
+ */
+namespace Loris\API;
+require_once __DIR__ . '/SafeExitException.php';
+require_once __DIR__ . '/../../../vendor/autoload.php';
+
+/**
+ * Base class to handle requests to the Loris API and perform
+ * validation common to all API requests.
+ *
+ * @category Main
+ * @package  API
+ * @author   Dave MacFarlane <david.macfarlane2@mcgill.ca>
+ * @license  http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link     https://www.github.com/aces/Loris/
+ */
+abstract class APIBase
+{
+    var $DB;
+    var $client;
+    var $JSON;
+    var $AllowedMethods = [];
+    var $AutoHandleRequestDelegation = true;
+    var $HTTPMethod;
+
+    var $Factory;
+    var $Headers;
+
+    /**
+     * Constructor to handle basic validation
+     *
+     * @param string $method The HTTP request method
+     */
+    function __construct($method)
+    {
+        if (empty($this->AllowedMethods)) {
+            $this->AllowedMethods = ['GET'];
+        }
+        // Verify that method is allowed for this type of request.
+        if (!in_array($method, $this->AllowedMethods)) {
+            $this->header("HTTP/1.1 405 Method Not Allowed");
+            $this->header("Allow: " . join(", ", $this->AllowedMethods));
+            $this->safeExit(0);
+        }
+
+        $this->HTTPMethod = $method;
+
+        //Load config file and ensure paths are correct
+        set_include_path(
+            get_include_path() . ":" .
+            __DIR__ . "/../../../php/libraries"
+        );
+        include_once 'NDB_Client.class.inc';
+
+        $this->Factory = \NDB_Factory::singleton();
+        $this->client  = new \NDB_Client();
+        if (defined("UNIT_TESTING")) {
+            // Unit tests are run from the command line, so avoid all
+            // the session stuff if we're in a unit test
+            $this->client->makeCommandLine();
+        }
+        $this->client->initialize(__DIR__ . "/../../../project/config.xml");
+
+        if (!defined("UNIT_TESTING")) {
+
+            if (!$this->client->isLoggedIn()) {
+                $this->header("HTTP/1.1 401 Unauthorized");
+                $this->error("User not authenticated");
+                $this->safeExit(0);
+            }
+        }
+
+        $this->DB = $this->Factory->database();
+
+        if ($this->AutoHandleRequestDelegation) {
+            $this->handleRequest();
+        }
+    }
+
+    /**
+     * Handles a request by delegating to the appropriate
+     * handle method
+     *
+     * @return void
+     */
+    function handleRequest()
+    {
+        $method = $this->HTTPMethod;
+
+        switch($this->HTTPMethod) {
+        case 'GET':
+            $this->handleETag();
+            $this->handleGET();
+            break;
+        case 'PUT':
+            $this->handlePUT();
+            break;
+        case 'POST':
+            $this->handlePOST();
+            break;
+        case 'OPTIONS':
+            $this->handleOPTIONS();
+            break;
+        case 'PATCH':
+            $this->handlePATCH();
+            break;
+
+        }
+    }
+
+    /**
+     * Determine the ETag for this resource and abort
+     * early if the client already has it.
+     *
+     * @return void
+     */
+    function handleETag()
+    {
+        session_cache_limiter('private');
+        $ETag = $this->calculateETag();
+
+        $this->header("ETag: $ETag");
+        if (isset($_SERVER['HTTP_IF_NONE_MATCH'])
+            && $_SERVER['HTTP_IF_NONE_MATCH'] === $ETag
+        ) {
+            $this->header("HTTP/1.1 304 Not Modified");
+            $this->safeExit(0);
+        }
+
+    }
+
+    /**
+     * Calculate the ETag for this resource
+     *
+     * @return string an ETag for this resource
+     */
+    abstract function calculateETag();
+
+    /**
+     * Handle a GET request
+     *
+     * @return void
+     */
+    function handleGET()
+    {
+
+    }
+
+    /**
+     * Handle a PUT request
+     *
+     * @return void
+     */
+    function handlePUT()
+    {
+        $this->header("HTTP/1.1 501 Not Implemented");
+        $this->safeExit(0);
+    }
+
+    /**
+     * Handle a POST request
+     *
+     * @return void
+     */
+    function handlePOST()
+    {
+        $this->header("HTTP/1.1 501 Not Implemented");
+        $this->safeExit(0);
+    }
+
+    /**
+     * Handle a PATCH request
+     *
+     * @return void
+     */
+    function handlePATCH()
+    {
+        $this->header("HTTP/1.1 501 Not Implemented");
+        $this->safeExit(0);
+    }
+
+    /**
+     * Handle a OPTIONS request
+     *
+     * @return void
+     */
+    function handleOPTIONS()
+    {
+        $this->Header(
+            "Access-Control-Allow-Methods: ".
+            join(",", $this->AllowedMethods)
+        );
+        $this->safeExit(0);
+    }
+
+    /**
+     * Encodes this object as a string of valid JSON
+     *
+     * @return string encoding of JSON
+     */
+    function toJSONString()
+    {
+        return json_encode($this->JSON);
+    }
+
+    /**
+     * Print an error message to the client
+     *
+     * @param string $msg The error message to display
+     *
+     * @return void
+     */
+    function error($msg)
+    {
+        print json_encode(["error" => $msg]);
+    }
+
+    /**
+     * Send a header to the client, or put it in an array
+     * to evaluate in unit testing if UNIT_TESTING is defined
+     *
+     * @param string $head The header to send to the client
+     *
+     * @return void
+     */
+    function header($head)
+    {
+        if (defined("UNIT_TESTING")) {
+            $this->Headers[] = $head;
+        } else {
+            header($head);
+        }
+    }
+
+    /**
+     * Exits the program in a way that is safe for unit testing
+     *
+     * @param integer $code The program exit code
+     *
+     * @return void but exits the running program
+     */
+    function safeExit($code)
+    {
+        if (defined("UNIT_TESTING")) {
+            throw new SafeExitException(
+                "Aborting test with code $code",
+                $code,
+                $this
+            );
+        } else {
+            exit($code);
+        }
+    }
+}
+?>
diff --git a/htdocs/api/v0.0.3-dev/Candidates.php b/htdocs/api/v0.0.3-dev/Candidates.php
new file mode 100644
index 00000000000..0f7770adc2e
--- /dev/null
+++ b/htdocs/api/v0.0.3-dev/Candidates.php
@@ -0,0 +1,247 @@
+<?php
+/**
+ * Handles a request to the candidates portion of the Loris API
+ *
+ * PHP Version 5.5+
+ *
+ * @category Main
+ * @package  API
+ * @author   Dave MacFarlane <david.macfarlane2@mcgill.ca>
+ * @license  http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link     https://www.github.com/aces/Loris/
+ */
+namespace Loris\API;
+set_include_path(get_include_path() . ":" . __DIR__);
+require_once 'APIBase.php';
+
+/**
+ * Class to handle a request to the candidates portion of the Loris API
+ *
+ * @category Main
+ * @package  API
+ * @author   Dave MacFarlane <david.macfarlane2@mcgill.ca>
+ * @license  http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link     https://www.github.com/aces/Loris/
+ */
+class Candidates extends APIBase
+{
+    var $RequestData;
+
+    /**
+     * Create a Candidates request handler
+     *
+     * @param string $method The HTTP request method of the request
+     * @param array  $data   The data that was POSTed to the request
+     */
+    public function __construct($method, $data=null)
+    {
+        $this->AllowedMethods = [
+                                 'GET',
+                                 'POST',
+                                ];
+        $this->RequestData    = $data;
+
+        parent::__construct($method);
+    }
+
+    /**
+     * Calculate an ETag by taking a hash of the number of candidates in the
+     * database and the time of the most recently changed one.
+     *
+     * @return string An ETag for ths candidates object
+     */
+    function calculateETag()
+    {
+        $ETagCriteria = $this->DB->pselectRow(
+            "SELECT MAX(TestDate) as Time,
+                    COUNT(DISTINCT CandID) as NumCandidates
+             FROM candidate WHERE Active='Y'",
+            array()
+        );
+        return md5(
+            'Candidates:'
+            . $ETagCriteria['Time']
+            . ':' . $ETagCriteria['NumCandidates']
+        );
+    }
+    /**
+     * Handles a candidates GET request
+     *
+     * @return void but populates $this->JSON
+     */
+    public function handleGET()
+    {
+        $candidates = $this->DB->pselect(
+            "SELECT CandID, ProjectID, PSCID, s.Alias as Site,
+                    EDC, DoB, Gender
+                FROM candidate c JOIN psc s on (s.CenterID=c.CenterID)
+             WHERE Active='Y'
+                ",
+            []
+        );
+
+        $projects   = \Utility::getProjectList();
+        $candValues = array_map(
+            function ($row) use ($projects) {
+                $row['Project'] = isset($projects[$row['ProjectID']])
+                    ? $projects[$row['ProjectID']]
+                    : "loris";
+                unset($row['ProjectID']);
+                return $row;
+            },
+            $candidates
+        );
+
+        $this->JSON = ["Candidates" => $candValues];
+    }
+
+    /**
+     * Handles a candidates POST request to validate data and if everything
+     * is valid, create the candidate
+     *
+     * @return void but populates $this->JSON and writes to DB
+     */
+    public function handlePOST()
+    {
+        $data = $this->RequestData;
+        if ($data === null) {
+            $this->header("HTTP/1.1 400 Bad Request");
+            $this->error("Can't parse data");
+            $this->safeExit(0);
+        }
+
+        if (!isset($data['Candidate'])) {
+            $this->header("HTTP/1.1 400 Bad Request");
+            $this->error("There is no Candidate object in the POST data");
+            $this->safeExit(0);
+        }
+
+        // This version of the API does not handle candidate creation
+        // when users are at multiple sites
+        $user      = \User::singleton();
+        $centerIDs = $user->getCenterIDs();
+        $num_sites = count($centerIDs);
+
+        if ($num_sites == 0) {
+            $this->header("HTTP/1.1 401 Unauthorized");
+            $this->error("You are not affiliated with any site");
+            $this->safeExit(0);
+        }
+
+        if ($num_sites > 1) {
+            $this->header("HTTP/1.1 501 Not Implemented");
+            $this->error(
+                "This API version does not support candidate creation " .
+                "by users with multiple site affiliations. This will be ".
+                "implemented in a future release."
+            );
+            $this->safeExit(0);
+        }
+
+        $centerID = $centerIDs[0];
+        $this->verifyField($data, 'Gender', ['Male', 'Female']);
+        $this->verifyField($data, 'DoB', 'YYYY-MM-DD');
+
+        //Candidate::createNew
+        try {
+            $candid = $this->createNew(
+                $centerID,
+                $data['Candidate']['DoB'],
+                $data['Candidate']['EDC'],
+                $data['Candidate']['Gender'],
+                $data['Candidate']['PSCID']
+            );
+
+        } catch(\LorisException $e) {
+            $this->header("HTTP/1.1 500 Internal Server Error");
+            $this->error("Candidate can't be created");
+            $this->safeExit(0);
+        }
+
+        if (isset($data['Candidate']['Project'])) {
+            $projectName = $data['Candidate']['Project'];
+            $project     = \Project::singleton($projectName);
+            if (!empty($project)) {
+                \Candidate::singleton($candid)->setData(
+                    array('ProjectID' => $project->getId())
+                );
+            }
+        }
+
+        $this->header("HTTP/1.1 201 Created");
+        $this->JSON = [
+                       'Meta' => ["CandID" => $candid],
+                      ];
+    }
+
+    /**
+     * Verifies that the field POSTed to the URL is valid.
+     *
+     * @param array  $data   The data that was posted
+     * @param string $field  The field to be validated in $data
+     * @param mixed  $values Can either be an array of valid values for
+     *                       the field, or a string representing the format
+     *                       expected of the data.
+     *
+     * @return void but will generate an error and exit if the value is invalid.
+     */
+    protected function verifyField($data, $field, $values)
+    {
+        if (!isset($data['Candidate'][$field])) {
+            $this->header("HTTP/1.1 400 Bad Request");
+            $this->error("Candidate's field missing");
+            $this->safeExit(0);
+        }
+        if (is_array($values) && !in_array($data['Candidate'][$field], $values)) {
+            $this->header("HTTP/1.1 400 Bad Request");
+            $this->error("Value not permitted");
+            $this->safeExit(0);
+        }
+        if ($values === 'YYYY-MM-DD'
+            && !preg_match("/\d\d\d\d\-\d\d\-\d\d/", $data['Candidate'][$field])
+        ) {
+            $this->header("HTTP/1.1 400 Bad Request");
+            $this->error("Invalid date format");
+            $this->safeExit(0);
+        }
+    }
+
+    /**
+     * Testable wrapper for Candidate::createNew
+     *
+     * @param string $centerID The center id of the candidate
+     * @param string $DoB      Date of birth of the candidate
+     * @param string $edc      EDC of the candidate
+     * @param string $gender   Gender of the candidate to be created
+     * @param string $PSCID    PSCID of the candidate to be created
+     *
+     * @return none
+     */
+    public function createNew($centerID, $DoB, $edc, $gender, $PSCID)
+    {
+        return \Candidate::createNew(
+            $centerID,
+            $DoB,
+            $edc,
+            $gender,
+            $PSCID
+        );
+    }
+}
+
+if (isset($_REQUEST['PrintCandidates'])) {
+    if ($_SERVER['REQUEST_METHOD'] === 'POST') {
+        $fp   = fopen("php://input", "r");
+        $data = '';
+        while (!feof($fp)) {
+            $data .= fread($fp, 1024);
+        }
+        fclose($fp);
+
+        $obj = new Candidates($_SERVER['REQUEST_METHOD'], json_decode($data, true));
+    } else {
+        $obj = new Candidates($_SERVER['REQUEST_METHOD']);
+    }
+    print $obj->toJSONString();
+}
+?>
diff --git a/htdocs/api/v0.0.3-dev/Login.php b/htdocs/api/v0.0.3-dev/Login.php
new file mode 100644
index 00000000000..f1cde7b39c9
--- /dev/null
+++ b/htdocs/api/v0.0.3-dev/Login.php
@@ -0,0 +1,205 @@
+<?php
+/**
+ * Handles a request to the login API endpoint in Loris
+ *
+ * PHP Version 5.4+
+ *
+ * @category Main
+ * @package  API
+ * @author   Dave MacFarlane <david.macfarlane2@mcgill.ca>
+ * @license  http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link     https://www.github.com/aces/Loris/
+ */
+
+namespace Loris\API;
+set_include_path(get_include_path() . ":" . __DIR__);
+require_once __DIR__ . '/APIBase.php';
+require_once __DIR__ . '/../../../vendor/autoload.php';
+
+/**
+ * Implementation of Login endpoint
+ *
+ * @category Main
+ * @package  API
+ * @author   Dave MacFarlane <david.macfarlane2@mcgill.ca>
+ * @license  http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link     https://www.github.com/aces/Loris/
+ */
+class Login extends APIBase
+{
+    /**
+     * Validates the data which was passed in the request.
+     *
+     * @param string $method The HTTP method of the request
+     * @param array  $data   The array-encode JSON posted to
+     *                       the URL.
+     */
+    function __construct($method, $data = array())
+    {
+        $this->AllowedMethods = array('POST');
+        $this->RequestData    = $data;
+
+        if (!in_array($method, $this->AllowedMethods)) {
+            $this->header("HTTP/1.1 405 Method Not Allowed");
+            $this->header("Allow: " . join(", ", $this->AllowedMethods));
+            $this->safeExit(0);
+        }
+
+        $client = new \NDB_Client();
+        // Bypass session handling because we're trying to authenticate a session
+        $client->makeCommandLine();
+        $client->initialize(__DIR__ . "/../../../project/config.xml");
+
+        $this->HTTPMethod = $method;
+        $this->handleRequest();
+    }
+
+    /**
+     * Handle a POST request
+     *
+     * @return void
+     */
+    function handlePOST()
+    {
+        if (empty($this->RequestData['username'])
+            || empty($this->RequestData['password'])
+        ) {
+            $this->header("HTTP/1.1 400 Bad Request");
+            $this->JSON = array("error" => "Missing username or password");
+            return;
+
+        }
+        $user     = $this->RequestData['username'];
+        $password = $this->RequestData['password'];
+
+        $login = $this->getLoginAuthenticator();
+
+        if ($login->passwordAuthenticate($user, $password, false)) {
+            $token = $this->getEncodedToken($user);
+            if (!empty($token)) {
+                $this->JSON = array("token" => $token);
+            } else {
+                $this->header("HTTP/1.1 500 Internal Server Error");
+                $this->JSON = array("error" => "Unacceptable JWT key.");
+            }
+        } else {
+            $this->header("HTTP/1.1 401 Unauthorized");
+            if (!empty($login->_lastError)) {
+                $this->JSON = array(
+                               "error" => $login->_lastError,
+                              );
+            }
+
+        }
+    }
+
+    /**
+     * Get the SinglePointLogin class used to authenticate this request
+     * in a separate function so that it can be mocked out for testing.
+     *
+     * @return SinglePointLogin Loris Authenticator
+     */
+    function getLoginAuthenticator()
+    {
+        return new \SinglePointLogin();
+    }
+
+    /**
+     * Return a valid JWT encoded identification token for the user
+     *
+     * @param string $user The user to return an identification token for
+     *
+     * @return string JWT encoded token
+     */
+    function getEncodedToken($user)
+    {
+        $factory = \NDB_Factory::singleton();
+        $config  = $factory->config();
+
+        $www     = $config->getSetting("www");
+        $baseURL = $www['url'];
+
+        $token = array(
+            // JWT related tokens to for the JWT library to validate
+                  "iss"  => $baseURL,
+                  "aud"  => $baseURL,
+            // Issued at
+                  "iat"  => time(),
+                  "nbf"  => time(),
+            // Expire in 1 day
+                  "exp"  => time() + 86400,
+            // Additional payload data
+                  "user" => $user,
+                 );
+
+        $key = $config->getSetting("JWTKey");
+        if (!self::isKeyStrong($key)) {
+            error_log(
+                'ERROR: JWTKey config variable is weak. '
+                .'Please change the key to a more cryptographically-secure value.'
+            );
+            return "";
+        }
+        return \Firebase\JWT\JWT::encode($token, $key, "HS256");
+    }
+
+    /**
+     * Calculate the ETag for this resource.
+     *
+     * Since this isn't a real resource, it just returns the
+     * empty string.
+     *
+     * @return string
+     */
+    function calculateETag()
+    {
+        return "";
+    }
+
+    /**
+    * Verify key meets cryptographic strength requirements
+    *
+    * @param string $key The JWT key to verify
+    *
+    * @return boolean Key passes strength test
+    */
+    static function isKeyStrong($key)
+    {
+        // Note: this code adapted from User::isPasswordStrong
+        $CharTypes = 0;
+        // less than 20 characters
+        if (strlen($key) < 20) {
+            return false;
+        }
+        // nothing but letters
+        if (!preg_match('/[^A-Za-z]/', $key)) {
+            return false;
+        }
+        // nothing but numbers
+        if (!preg_match('/[^0-9]/', $key)) {
+            return false;
+        }
+        // preg_match returns 1 on match, 0 on non-match
+        $CharTypes += preg_match('/[0-9]+/', $key);
+        $CharTypes += preg_match('/[A-Za-z]+/', $key);
+        $CharTypes += preg_match('/[!\\\$\^@#%&\*\(\)]+/', $key);
+        if ($CharTypes < 3) {
+            return false;
+        }
+
+        return true;
+    }
+}
+
+if (isset($_REQUEST['PrintLogin'])) {
+    // Without this line, mod_rewrite eats the $_POST variable.
+    $body = file_get_contents("php://input");
+    if ($_SERVER['REQUEST_METHOD'] === 'POST') {
+        $obj = new Login($_SERVER['REQUEST_METHOD'], json_decode($body, true));
+    } else {
+        $obj = new Login($_SERVER['REQUEST_METHOD']);
+    }
+    header('Content-type: application/json');
+    print $obj->toJSONString();
+}
+?>
diff --git a/htdocs/api/v0.0.3-dev/Projects.php b/htdocs/api/v0.0.3-dev/Projects.php
new file mode 100644
index 00000000000..a9c284d1eec
--- /dev/null
+++ b/htdocs/api/v0.0.3-dev/Projects.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * Handles requests to the projects portion of the API
+ *
+ * PHP Version 5.5+
+ *
+ * @category Main
+ * @package  API
+ * @author   Dave MacFarlane <david.macfarlane2@mcgill.ca>
+ * @license  http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link     https://www.github.com/aces/Loris/
+ */
+namespace Loris\API;
+set_include_path(get_include_path() . ":" . __DIR__);
+require_once 'APIBase.php';
+
+/**
+ * Handles requests to the projects portion of the API
+ *
+ * @category Main
+ * @package  API
+ * @author   Dave MacFarlane <david.macfarlane2@mcgill.ca>
+ * @license  http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link     https://www.github.com/aces/Loris/
+ */
+class Projects extends APIBase
+{
+    /**
+     * Constructs a Projects handler
+     *
+     * @param string $method The HTTP request method
+     */
+    public function __construct($method)
+    {
+        parent::__construct($method);
+    }
+
+    /**
+     * Handles a GET request
+     *
+     * @return void but populates $this->JSON
+     */
+    public function handleGET()
+    {
+        if (!empty($this->JSON)) {
+            return;
+        }
+        $config = $this->Factory->config();
+
+        $useProjects = $config->getSetting("useProjects");
+        $useEDC      = $config->getSetting("useEDC");
+
+        if ($useEDC === '1' || $useEDC === 'true') {
+            $useEDC = true;
+        } else {
+            $useEDC = false;
+        }
+        $PSCID       = $config->getSetting("PSCID");
+        $PSCIDFormat = \Utility::structureToPCRE($PSCID['structure'], "SITE");
+
+        $type = $PSCID['generation'] == 'sequential' ? 'auto' : 'prompt';
+
+        $settings = [
+                     "useEDC" => $useEDC,
+                     "PSCID"  => [
+                                  "Type"  => $type,
+                                  "Regex" => $PSCIDFormat,
+                                 ],
+                    ];
+
+        if ($useProjects && $useProjects !== "false" && $useProjects !== "0") {
+            $projects  = \Utility::getProjectList();
+            $projArray = [];
+            foreach ($projects as $project) {
+                $projArray[$project] = $settings;
+            }
+            $this->JSON = ["Projects" => $projArray];
+        } else {
+            $this->JSON = [
+                           "Projects" => array("loris" => $settings),
+                          ];
+        }
+    }
+
+    /**
+     * Calculates ETag for projects based on the JSON encoding
+     *
+     * @return string ETag for projects
+     */
+    function calculateETag()
+    {
+        $this->handleGET();
+        $etag = md5(json_encode($this->JSON, true));
+        return $etag;
+    }
+}
+
+if (isset($_REQUEST['PrintProjects'])) {
+    $obj = new Projects($_SERVER['REQUEST_METHOD']);
+    print $obj->toJSONString();
+}
+?>
diff --git a/htdocs/api/v0.0.3-dev/SafeExitException.php b/htdocs/api/v0.0.3-dev/SafeExitException.php
new file mode 100644
index 00000000000..e6387914253
--- /dev/null
+++ b/htdocs/api/v0.0.3-dev/SafeExitException.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * This file declares an exception that is thrown instead of exit(0)ing, so
+ * that the exit can be caught in unit testing instead of the program exiting
+ * directly.
+ *
+ * PHP Version 5
+ *
+ * @category Main
+ * @package  API
+ * @author   Dave MacFarlane <david.macfarlane2@mcgill.ca>
+ * @license  http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link     https://www.github.com/aces/Loris/
+ */
+namespace Loris\API;
+/**
+ * SafeExitException for exiting API in a way that is testable
+ *
+ * @category Main
+ * @package  API
+ * @author   Dave MacFarlane <david.macfarlane2@mcgill.ca>
+ * @license  http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link     https://www.github.com/aces/Loris/
+ */
+class SafeExitException extends \Exception
+{
+    var $Object;
+
+    /**
+     * Exception to throw to exit program
+     *
+     * @param string  $message    Message to display
+     * @param integer $exitStatus The exit code to exit the program with
+     * @param object  $obj        The object throwing the exception.
+     */
+    function __construct($message, $exitStatus, $obj)
+    {
+        parent::__construct($message, $exitStatus);
+        $this->Object = $obj;
+    }
+}
+?>
diff --git a/htdocs/api/v0.0.3-dev/candidates/Candidate.php b/htdocs/api/v0.0.3-dev/candidates/Candidate.php
new file mode 100644
index 00000000000..ff9f52e6864
--- /dev/null
+++ b/htdocs/api/v0.0.3-dev/candidates/Candidate.php
@@ -0,0 +1,130 @@
+<?php
+/**
+ * Handles HTTP requests to the Candidate portion of the
+ * Loris REST API.
+ *
+ * PHP Version 5
+ *
+ * @category Main
+ * @package  API
+ * @author   Dave MacFarlane <david.macfarlane2@mcgill.ca>
+ * @license  http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link     https://www.github.com/aces/Loris/
+ */
+namespace Loris\API\Candidates;
+set_include_path(get_include_path() . ":" . __DIR__ . "/../");
+require_once 'APIBase.php';
+
+/**
+ * Class to handle HTTP requests to the Candidate portion of the
+ * Loris REST API.
+ *
+ * @category Main
+ * @package  API
+ * @author   Dave MacFarlane <david.macfarlane2@mcgill.ca>
+ * @license  http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link     https://www.github.com/aces/Loris/
+ */
+class Candidate extends \Loris\API\APIBase
+{
+    var $Candidate;
+
+    /**
+     * Construct class to handle request
+     *
+     * @param string $method HTTP method of request
+     * @param string $CandID CandID of candidate to be serialized
+     */
+    public function __construct($method, $CandID)
+    {
+        $requestDelegationCascade = $this->AutoHandleRequestDelegation;
+
+        $this->AutoHandleRequestDelegation = false;
+        $this->CandID = $CandID;
+
+        parent::__construct($method);
+
+        if (!is_numeric($CandID)
+            || $CandID < 100000
+            || $CandID > 999999
+        ) {
+            $this->header("HTTP/1.1 400 Bad Request");
+            $this->error("Invalid CandID format");
+            $this->safeExit(0);
+
+        }
+
+        try {
+            $this->Candidate = $this->Factory->Candidate($CandID);
+        } catch(\Exception $e) {
+            $this->header("HTTP/1.1 404 Not Found");
+            $this->error("Unknown CandID");
+            $this->safeExit(0);
+        }
+
+        if ($requestDelegationCascade) {
+            $this->handleRequest();
+        }
+    }
+
+    /**
+     * Handle a GET request
+     *
+     * @return void but populates $this->JSON
+     */
+    public function handleGET()
+    {
+        $Site   = $this->Candidate->getCandidateSite();
+        $Gender = $this->Candidate->getCandidateGender();
+
+        $this->JSON = [
+                       "Meta"   => [
+                                    "CandID"  => $this->CandID,
+                                    'Project' => $this->Candidate->getProjectTitle(),
+                                    'PSCID'   => $this->Candidate->getPSCID(),
+                                    'Site'    => $Site,
+                                    'EDC'     => $this->Candidate->getCandidateEDC(),
+                                    'DoB'     => $this->Candidate->getCandidateDoB(),
+                                    'Gender'  => $Gender,
+                                   ],
+                       "Visits" => array_values(
+                           $this->Candidate->getListOfVisitLabels()
+                       ),
+                      ];
+    }
+
+    /**
+     * Calculate the ETag for this Candidate by taking a hash of the
+     * most recent change to the candidate, visit tables or number of
+     * visits
+     *
+     * @return string An ETag for this object
+     */
+    function calculateETag()
+    {
+        $row = $this->DB->pselectRow(
+            "SELECT MAX(c.Testdate) as CandChange,
+                MAX(s.Testdate) as VisitChange,
+                COUNT(s.Visit_label) as VisitCount
+            FROM candidate c JOIN session s ON (c.CandID=s.CandID)
+            WHERE c.CandID=:candidate",
+            array("candidate" => $this->CandID)
+        );
+        return md5(
+            'Candidate:' . $this->CandID . ':'
+            . $row['CandChange'] . ':'
+            . $row['VisitChange'] . ':'
+            . $row['VisitCount']
+        );
+    }
+
+}
+
+if (isset($_REQUEST['PrintCandidate'])) {
+    $obj = new \Loris\API\Candidates\Candidate(
+        $_SERVER['REQUEST_METHOD'],
+        $_REQUEST['CandID']
+    );
+    print $obj->toJSONString();
+}
+?>
diff --git a/htdocs/api/v0.0.3-dev/candidates/InstrumentData.php b/htdocs/api/v0.0.3-dev/candidates/InstrumentData.php
new file mode 100644
index 00000000000..73ed7eb046d
--- /dev/null
+++ b/htdocs/api/v0.0.3-dev/candidates/InstrumentData.php
@@ -0,0 +1,243 @@
+<?php
+/**
+ * File to handle instrument data request through Loris REST API
+ *
+ * PHP Version 5.5+
+ *
+ * @category Main
+ * @package  API
+ * @author   Dave MacFarlane <david.macfarlane2@mcgill.ca>
+ * @license  http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link     https://www.github.com/aces/Loris/
+ */
+
+namespace Loris\API\Candidates\Candidate;
+set_include_path(get_include_path() . ":" . __DIR__);
+require_once 'Instruments.php';
+
+/**
+ * Class to handle Instrument Data HTTP requests
+ *
+ * @category Main
+ * @package  API
+ * @author   Dave MacFarlane <david.macfarlane2@mcgill.ca>
+ * @license  http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link     https://www.github.com/aces/Loris/
+ */
+class InstrumentData extends \Loris\API\Candidates\Candidate\Instruments
+{
+    var $Instrument;
+
+    /**
+     * Construct a request handler for candidate instrument data
+     *
+     * @param string  $method     The HTTP method to be handled
+     * @param string  $CandID     The CandID this API call is for
+     * @param string  $Visit      The Visit this API call is for
+     * @param string  $Instrument The instrument this API call is for
+     * @param boolean $bDDE       If true, handle DDE instrument instead of
+     *                            normal instrument data
+     * @param boolean $bFlags     If true, include instrument flag data in
+     *                            serialization
+     */
+    public function __construct(
+        $method,
+        $CandID,
+        $Visit,
+        $Instrument,
+        $bDDE,
+        $bFlags
+    ) {
+        if (empty($this->AllowedMethods)) {
+            $this->AllowedMethods = [
+                                     'GET',
+                                     'PUT',
+                                     'PATCH',
+                                     'OPTIONS',
+                                    ];
+        }
+        $this->AutoHandleRequestDelegation = false;
+        $this->bDDE   = $bDDE;
+        $this->bFlags = $bFlags;
+
+        parent::__construct($method, $CandID, $Visit);
+
+        // instruments may need access to project libraries
+        set_include_path(
+            get_include_path()
+            . ":" . __DIR__ . "/../../../../project/libraries"
+        );
+        include_once "NDB_BVL_Instrument.class.inc";
+
+        $CommentID = $this->DB->pselectOne(
+            "SELECT CommentID FROM flag f
+                LEFT JOIN session s ON (s.ID=f.SessionID AND s.Visit_label=:VL)
+                LEFT JOIN candidate c USING (CandID)
+            WHERE Test_name=:TN AND s.CandID=:CID AND
+                  s.Active='Y' AND c.Active='Y' AND f.CommentID NOT LIKE 'DDE%'",
+            array(
+             'VL'  => $this->VisitLabel,
+             'TN'  => $Instrument,
+             'CID' => $this->CandID,
+            )
+        );
+
+        if (empty($CommentID)) {
+            $this->header("HTTP/1.1 404 Not Found");
+            $this->error("Invalid instrument for candidate");
+            $this->safeExit(0);
+        }
+        if ($this->bDDE) {
+            $CommentID = 'DDE_' . $CommentID;
+        }
+
+        try {
+            $this->Instrument = \NDB_BVL_Instrument::factory(
+                $Instrument,
+                $CommentID,
+                null,
+                true
+            );
+        } catch(\Exception $e) {
+            $this->header("HTTP/1.1 404 Not Found");
+            $this->error("Invalid instrument");
+            $this->safeExit(0);
+        }
+
+        $this->handleRequest();
+
+    }
+
+    /**
+     * Handle a GET request
+     *
+     * @return void but populate $this->JSON
+     */
+    function handleGET()
+    {
+        $this->JSON = [
+                       "Meta" => [
+                                  "Instrument" => $this->Instrument->testName,
+                                  "Visit"      => $this->VisitLabel,
+                                  "Candidate"  => $this->CandID,
+                                  "DDE"        => $this->bDDE,
+                                 ],
+                      ];
+
+        if (!$this->bFlags) {
+            $Values = \NDB_BVL_Instrument::loadInstanceData($this->Instrument);
+
+            unset($Values['CommentID']);
+            unset($Values['UserID']);
+            unset($Values['Testdate']);
+            unset($Values['Data_entry_completion_status']);
+
+            $this->JSON[$this->Instrument->testName] = $Values;
+        } else {
+            $flags = $this->DB->pselectRow(
+                "SELECT Data_entry, Administration, Validity
+                 FROM flag WHERE CommentID=:CID",
+                ['CID' => $this->Instrument->getCommentID()]
+            );
+
+            if (!$this->Instrument->ValidityEnabled) {
+                unset($flags['Validity']);
+            }
+            $this->JSON['Flags'] = $flags;
+        }
+    }
+
+    /**
+     * Handle an OPTIONS request
+     *
+     * @return void but modifies HTTP headers sent
+     */
+    function handleOPTIONS()
+    {
+        $this->Header(
+            "Access-Control-Allow-Methods: ".
+            join(",", $this->AllowedMethods)
+        );
+    }
+
+    /**
+     * Handle a PUT request
+     *
+     * @return void but populates $this->JSON and writes to database
+     */
+    function handlePUT()
+    {
+        $fp   = fopen("php://input", "r");
+        $data = '';
+        while (!feof($fp)) {
+            $data .= fread($fp, 1024);
+        }
+        fclose($fp);
+
+        $data            = json_decode($data);
+        $instrument_name = $this->Instrument->testName;
+
+        if ($this->Instrument->validate($data)) {
+            $this->Instrument->clearInstrument();
+            $this->Instrument->_save($data->${instrument_name});
+            $this->JSON = array("success" => "Updated");
+        } else {
+            $this->Header("HTTP/1.1 403 Forbidden");
+            if (!$this->Instrument->determineDataEntryAllowed()) {
+                $msg = "Can not update instruments that"
+                       . " are flagged as complete";
+
+                $this->JSON = array('error' => $msg);
+            } else {
+                $this->JSON = array("error" => "Could not update.");
+            }
+        }
+    }
+
+    /**
+     * Handle a PUT request
+     *
+     * @return void but populates $this->JSON and writes to database
+     */
+    function handlePATCH()
+    {
+        $fp   = fopen("php://input", "r");
+        $data = '';
+        while (!feof($fp)) {
+            $data .= fread($fp, 1024);
+        }
+        fclose($fp);
+
+        $data            = json_decode($data);
+        $instrument_name = $this->Instrument->testName;
+
+        if ($this->Instrument->validate($data)) {
+            $this->Instrument->_save($data->${instrument_name});
+            $this->JSON = array("success" => "Updated");
+        } else {
+            $this->Header("HTTP/1.1 403 Forbidden");
+            if (!$this->Instrument->determineDataEntryAllowed()) {
+                $msg = "Can not update instruments that"
+                       . " are flagged as complete";
+
+                $this->JSON = array('error' => $msg);
+            } else {
+                $this->JSON = array("error" => "Could not update.");
+            }
+        }
+    }
+
+}
+
+if (isset($_REQUEST['PrintInstrumentData'])) {
+    $obj = new InstrumentData(
+        $_SERVER['REQUEST_METHOD'],
+        $_REQUEST['CandID'],
+        $_REQUEST['Visit'],
+        $_REQUEST['Instrument'],
+        isset($_REQUEST['DDE'])   ? true : false,
+        isset($_REQUEST['flags']) ? true : false
+    );
+    print $obj->toJSONString();
+}
+?>
diff --git a/htdocs/api/v0.0.3-dev/candidates/Instruments.php b/htdocs/api/v0.0.3-dev/candidates/Instruments.php
new file mode 100644
index 00000000000..e72c91d20f9
--- /dev/null
+++ b/htdocs/api/v0.0.3-dev/candidates/Instruments.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Contains class to get the list of instruments for a candidate's
+ * visit through the API.
+ *
+ * PHP Version 5
+ *
+ * @category Main
+ * @package  API
+ * @author   Dave MacFarlane <david.macfarlane2@mcgill.ca>
+ * @license  http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link     https://www.github.com/aces/Loris/
+ */
+namespace Loris\API\Candidates\Candidate;
+set_include_path(get_include_path() . ":" . __DIR__ . "/../");
+
+require_once 'Visit.php';
+
+/**
+ * Class to handle HTTP requests for a candidate's instruments.
+ * Extends Visit because the visit for the candidate also needs
+ * to be validated before the instruments can be serialized.
+ *
+ * @category Main
+ * @package  API
+ * @author   Dave MacFarlane <david.macfarlane2@mcgill.ca>
+ * @license  http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link     https://www.github.com/aces/Loris/
+ */
+class Instruments extends Visit
+{
+    /**
+     * Construct an Instruments API handler
+     *
+     * @param string $method The HTTP request method
+     * @param string $CandID The CandID to get the instruments for
+     * @param string $Visit  The visit label for $CandID to retrieve
+     *                       instruments for
+     */
+    public function __construct($method, $CandID, $Visit)
+    {
+        if (empty($this->AllowedMethods)) {
+            $this->AllowedMethods = ['GET'];
+        }
+        $requestDelegationCascade = $this->AutoHandleRequestDelegation;
+        // Parent will validate CandID and Visit Label and abort if necessary
+        parent::__construct($method, $CandID, $Visit);
+
+        if ($requestDelegationCascade) {
+            $this->handleRequest();
+        }
+    }
+
+    /**
+     * Handles a GET request for this API call.
+     *
+     * @return void but populates $this->JSON
+     */
+    public function handleGET()
+    {
+        $Insts = $this->DB->pselect(
+            "SELECT DISTINCT Test_name"
+            .    " FROM flag f"
+            .       " JOIN session s ON (s.ID=f.SessionID)"
+            . " WHERE s.CandID=:CID AND s.Active='Y' AND s.Visit_label=:VL",
+            array(
+             'CID' => $this->CandID,
+             'VL'  => $this->VisitLabel,
+            )
+        );
+
+        //array_column only exists in PHP 5.5+, need to use array_map
+        //until we no longer support 5.4..
+        //$Instruments = array_column($Insts, 'Test_name');
+        $Instruments = array_map(
+            function ($element) {
+                return $element['Test_name'];
+            },
+            $Insts
+        );
+
+        $this->JSON = [
+                       "Meta"        => [
+                                         "CandID" => $this->CandID,
+                                         'Visit'  => $this->VisitLabel,
+                                        ],
+                       'Instruments' => $Instruments,
+                      ];
+    }
+}
+
+if (isset($_REQUEST['PrintInstruments'])) {
+    $obj = new Instruments(
+        $_SERVER['REQUEST_METHOD'],
+        $_REQUEST['CandID'],
+        $_REQUEST['VisitLabel']
+    );
+    print $obj->toJSONString();
+}
+
+?>
diff --git a/htdocs/api/v0.0.3-dev/candidates/Visit.php b/htdocs/api/v0.0.3-dev/candidates/Visit.php
new file mode 100644
index 00000000000..cafc8199977
--- /dev/null
+++ b/htdocs/api/v0.0.3-dev/candidates/Visit.php
@@ -0,0 +1,250 @@
+<?php
+/**
+ * Handles API requests for the candidate's visit
+ *
+ * PHP Version 5.5+
+ *
+ * @category Main
+ * @package  API
+ * @author   Dave MacFarlane <david.macfarlane2@mcgill.ca>
+ * @license  http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link     https://www.github.com/aces/Loris/
+ */
+namespace Loris\API\Candidates\Candidate;
+set_include_path(
+    get_include_path()
+    . ":" . __DIR__ . "/../"
+    . ':' . __DIR__ . "/../../../../php/libraries/"
+);
+
+require_once 'Candidate.php';
+require_once 'TimePoint.class.inc';
+
+/**
+ * Handles API requests for the candidate's visit. Extends
+ * Candidate so that the constructor will validate the candidate
+ * portion of URL automatically.
+ *
+ * @category Main
+ * @package  API
+ * @author   Dave MacFarlane <david.macfarlane2@mcgill.ca>
+ * @license  http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link     https://www.github.com/aces/Loris/
+ */
+class Visit extends \Loris\API\Candidates\Candidate
+{
+    /**
+     * Construct a visit class object to serialize candidate visits
+     *
+     * @param string $method     The method of the HTTP request
+     * @param string $CandID     The CandID to be serialized
+     * @param string $VisitLabel The visit label to be serialized
+     * @param string $InputData  The data posted to this URL
+     */
+    public function __construct($method, $CandID, $VisitLabel, $InputData=null)
+    {
+        $requestDelegationCascade = $this->AutoHandleRequestDelegation;
+
+        $this->AutoHandleRequestDelegation = false;
+
+        if (empty($this->AllowedMethods)) {
+            $this->AllowedMethods = [
+                                     'GET',
+                                     'PUT',
+                                    ];
+        }
+        $this->CandID     = $CandID;
+        $this->VisitLabel = $VisitLabel;
+
+        //   $this->Timepoint = \Timepoint::singleton($timepointID);
+        // Parent constructor will handle validation of
+        // CandID
+        parent::__construct($method, $CandID);
+        if ($method === 'PUT') {
+            $this->ReceivedJSON = $InputData;
+        } else {
+            $timepoints = $this->Candidate->getListOfVisitLabels();
+            $Visits     = array_values($timepoints);
+
+            $session = array_keys($timepoints, $VisitLabel);
+            if (isset($session[0])) {
+                $this->Timepoint = $this->Factory->TimePoint($session[0]);
+            }
+
+            if (!in_array($VisitLabel, $Visits)) {
+                $this->header("HTTP/1.1 404 Not Found");
+                $this->error("Invalid visit $VisitLabel");
+                $this->safeExit(0);
+            }
+        }
+
+        if ($requestDelegationCascade) {
+            $this->handleRequest();
+        }
+
+    }
+
+    /**
+     * Handles a GET request
+     *
+     * @return void but populates $this->JSON
+     */
+    public function handleGET()
+    {
+        $SubProjTitle = $this->Timepoint->getData("SubprojectTitle");
+
+        $this->JSON = [
+                       "Meta" => [
+                                  "CandID"  => $this->CandID,
+                                  'Visit'   => $this->VisitLabel,
+                                  'Battery' => $SubProjTitle,
+                                 ],
+                      ];
+        if ($this->Timepoint) {
+            $stages = [];
+            if ($this->Timepoint->getDateOfScreening() !== null) {
+                $Date   = $this->Timepoint->getDateOfScreening();
+                $Status = $this->Timepoint->getScreeningStatus();
+
+                $stages['Screening'] = [
+                                        'Date'   => $Date,
+                                        'Status' => $Status,
+                                       ];
+            }
+            if ($this->Timepoint->getDateOfVisit() !== null) {
+                $Date   = $this->Timepoint->getDateOfVisit();
+                $Status = $this->Timepoint->getVisitStatus();
+
+                $stages['Visit'] = [
+                                    'Date'   => $Date,
+                                    'Status' => $Status,
+                                   ];
+            }
+            if ($this->Timepoint->getDateOfApproval() !== null) {
+                $Date   = $this->Timepoint->getDateOfApproval();
+                $Status = $this->Timepoint->getApprovalStatus();
+
+                $stages['Approval'] = [
+                                       'Date'   => $Date,
+                                       'Status' => $Status,
+                                      ];
+            }
+            $this->JSON['Stages'] = $stages;
+        }
+    }
+
+    /**
+     * Handles a PUT request for a visit
+     *
+     * @return void
+     */
+    public function handlePUT()
+    {
+        if (!isset($this->ReceivedJSON['Meta']['CandID'])
+            || $this->ReceivedJSON['Meta']['CandID'] != $this->CandID
+        ) {
+                $this->header("HTTP/1.1 400 Bad Request");
+                $this->error("Candidate from URL does not match metadata");
+                $this->safeExit(0);
+        }
+        if (!isset($this->ReceivedJSON['Meta']['Visit'])
+            || $this->ReceivedJSON['Meta']['Visit'] != $this->VisitLabel
+        ) {
+                $this->header("HTTP/1.1 400 Bad Request");
+                $this->error("Visit from URL does not match metadata");
+                $this->safeExit(0);
+        }
+
+        $subprojects  = \Utility::getSubprojectList();
+        $subprojectID = null;
+        foreach ($subprojects as $subproject => $title) {
+            if ($title === $this->ReceivedJSON['Meta']['Battery']) {
+                $subprojectID = $subproject;
+                break;
+            }
+        }
+        if ($subprojectID === null) {
+            $this->header("HTTP/1.1 400 Bad Request");
+            $this->error("Test battery specified does not exist");
+            $this->safeExit(0);
+
+        }
+        // This version of the API does not handle timepoint creation
+        // when users are at multiple sites
+        $user      = \User::singleton();
+        $centerIDs = $user->getCenterIDs();
+        $num_sites = count($centerIDs);
+        if ($num_sites == 0) {
+            $this->header("HTTP/1.1 401 Unauthorized");
+            $this->error("You are not affiliated with any site");
+            $this->safeExit(0);
+        } else if ($num_sites > 1) {
+            $this->header("HTTP/1.1 501 Not Implemented");
+            $this->error(
+                "This API version does not support timepoint creation " .
+                "by users with multiple site affiliations. This will be ".
+                "implemented in a future release."
+            );
+            $this->safeExit(0);
+        } else {
+            $centerID          = $centerIDs[0];
+            $candidateCenterID = \Candidate::singleton($this->CandID)
+                ->getCenterID();
+            if ($centerID != $candidateCenterID) {
+                $this->header("HTTP/1.1 401 Unauthorized");
+                $this->error("You are not affiliated with the candidate's site");
+                $this->safeExit(0);
+            }
+            // need to extract subprojectID
+            $this->createNew($this->CandID, $subprojectID, $this->VisitLabel);
+            $this->header("HTTP/1.1 201 Created");
+        }
+    }
+
+    /**
+     * Create a new timepoint
+     *
+     * This is a wrapper around the Timepoint::createNew function
+     * that can be stubbed out for testing.
+     *
+     * @param integer $CandID       The candidate with the visit
+     * @param integer $subprojectID The subproject for the new visit
+     * @param string  $VL           The visit label of the visit to
+     *                              be created
+     *
+     * @return void
+     */
+    function createNew($CandID, $subprojectID, $VL)
+    {
+        try {
+            \TimePoint::isValidVisitLabel($CandID, $subprojectID, $VL);
+        } catch (\LorisException $e) {
+            $this->header("HTTP/1.1 400 Bad Request");
+            $this->error($e->getMessage());
+            $this->safeExit(0);
+        }
+
+        \TimePoint::createNew($CandID, $subprojectID, $VL);
+    }
+}
+
+if (isset($_REQUEST['PrintVisit'])) {
+    $InputDataArray = file_get_contents("php://input");
+    $InputData      = json_decode($InputDataArray, true);
+    if ($_SERVER['REQUEST_METHOD'] === 'PUT') {
+        $obj = new Visit(
+            $_SERVER['REQUEST_METHOD'],
+            $_REQUEST['CandID'],
+            $_REQUEST['VisitLabel'],
+            $InputData
+        );
+    } else {
+        $obj = new Visit(
+            $_SERVER['REQUEST_METHOD'],
+            $_REQUEST['CandID'],
+            $_REQUEST['VisitLabel']
+        );
+    }
+    print $obj->toJSONString();
+}
+?>
diff --git a/htdocs/api/v0.0.3-dev/candidates/visits/Images.php b/htdocs/api/v0.0.3-dev/candidates/visits/Images.php
new file mode 100644
index 00000000000..7339c32e880
--- /dev/null
+++ b/htdocs/api/v0.0.3-dev/candidates/visits/Images.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * Handles API requests for the candidate's visit
+ *
+ * PHP Version 5.5+
+ *
+ * @category Main
+ * @package  API
+ * @author   Dave MacFarlane <david.macfarlane2@mcgill.ca>
+ * @license  http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link     https://www.github.com/aces/Loris/
+ */
+namespace Loris\API\Candidates\Candidate\Visit;
+require_once '../Visit.php';
+/**
+ * Handles API requests for the candidate's visit. Extends
+ * Candidate so that the constructor will validate the candidate
+ * portion of URL automatically.
+ *
+ * @category Main
+ * @package  API
+ * @author   Dave MacFarlane <david.macfarlane2@mcgill.ca>
+ * @license  http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link     https://www.github.com/aces/Loris/
+ */
+class Images extends \Loris\API\Candidates\Candidate\Visit
+{
+    /**
+     * Construct a visit class object to serialize candidate visits
+     *
+     * @param string $method     The method of the HTTP request
+     * @param string $CandID     The CandID to be serialized
+     * @param string $VisitLabel The visit label to be serialized
+     */
+    public function __construct($method, $CandID, $VisitLabel)
+    {
+        $requestDelegationCascade = $this->AutoHandleRequestDelegation;
+
+        $this->AutoHandleRequestDelegation = false;
+
+        if (empty($this->AllowedMethods)) {
+            $this->AllowedMethods = ['GET'];
+        }
+        $this->CandID     = $CandID;
+        $this->VisitLabel = $VisitLabel;
+
+        //   $this->Timepoint = \Timepoint::singleton($timepointID);
+        // Parent constructor will handle validation of
+        // CandID
+        parent::__construct($method, $CandID, $VisitLabel);
+
+        if ($requestDelegationCascade) {
+            $this->handleRequest();
+        }
+
+    }
+
+    /**
+     * Handles a GET request
+     *
+     * @return void but populates $this->JSON
+     */
+    public function handleGET()
+    {
+        $this->JSON          = [
+                                'Meta' => [
+                                           'CandID' => $this->CandID,
+                                           'Visit'  => $this->VisitLabel,
+                                          ],
+                               ];
+        $this->JSON['Files'] = $this->GetVisitImages();
+
+    }
+
+    /**
+     * Gets a list of images for this visit. Filename only.
+     *
+     * @return an array of strings of filenames
+     */
+    function getVisitImages()
+    {
+        $factory = \NDB_Factory::singleton();
+        $DB      = $factory->database();
+        $rows    = $DB->pselect(
+            "SELECT OutputType,
+                    SUBSTRING_INDEX(File, '/', -1) as Filename,
+                    mst.Scan_type as AcquisitionType 
+                FROM files f 
+                    JOIN mri_scan_type mst ON (mst.ID=f.AcquisitionProtocolID)
+                    JOIN session s ON (s.ID=f.SessionID)
+                    JOIN candidate c ON (s.CandID=c.CandID)
+                WHERE s.Visit_label=:VL AND c.CandID=:CID 
+                    AND c.Active='Y' AND s.Active='Y'",
+            [
+             'VL'  => $this->VisitLabel,
+             'CID' => $this->CandID,
+            ]
+        );
+        return $rows;
+    }
+
+}
+
+if (isset($_REQUEST['PrintImages'])) {
+    $obj = new Images(
+        $_SERVER['REQUEST_METHOD'],
+        $_REQUEST['CandID'],
+        $_REQUEST['VisitLabel']
+    );
+    print $obj->toJSONString();
+}
+?>
diff --git a/htdocs/api/v0.0.3-dev/candidates/visits/images/Image.php b/htdocs/api/v0.0.3-dev/candidates/visits/images/Image.php
new file mode 100644
index 00000000000..4aa17f39ddc
--- /dev/null
+++ b/htdocs/api/v0.0.3-dev/candidates/visits/images/Image.php
@@ -0,0 +1,209 @@
+<?php
+/**
+ * Handles API requests for the candidate's visit
+ *
+ * PHP Version 5.5+
+ *
+ * @category Main
+ * @package  API
+ * @author   Dave MacFarlane <david.macfarlane2@mcgill.ca>
+ * @license  http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link     https://www.github.com/aces/Loris/
+ */
+namespace Loris\API\Candidates\Candidate\Visit\Imaging;
+require_once __DIR__ . '/../../Visit.php';
+/**
+ * Handles API requests for the candidate's visit. Extends
+ * Candidate so that the constructor will validate the candidate
+ * portion of URL automatically.
+ *
+ * @category Main
+ * @package  API
+ * @author   Dave MacFarlane <david.macfarlane2@mcgill.ca>
+ * @license  http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link     https://www.github.com/aces/Loris/
+ */
+class Image extends \Loris\API\Candidates\Candidate\Visit
+{
+    /**
+     * Construct a visit class object to serialize candidate visits
+     *
+     * @param string $method     The method of the HTTP request
+     * @param string $CandID     The CandID to be serialized
+     * @param string $VisitLabel The visit label to be serialized
+     * @param string $Filename   The file name to be retrieved
+     */
+    public function __construct($method, $CandID, $VisitLabel, $Filename)
+    {
+        ob_start();
+        $requestDelegationCascade = $this->AutoHandleRequestDelegation;
+
+        $this->AutoHandleRequestDelegation = false;
+
+        if (empty($this->AllowedMethods)) {
+            $this->AllowedMethods = [
+                                     'GET',
+                                     'PUT',
+                                    ];
+        }
+        $this->CandID     = $CandID;
+        $this->VisitLabel = $VisitLabel;
+        $this->Filename   = $Filename;
+
+        //   $this->Timepoint = \Timepoint::singleton($timepointID);
+        // Parent constructor will handle validation of
+        // CandID
+        parent::__construct($method, $CandID, $VisitLabel);
+
+        $results =  $this->getDatabaseDir();
+        if (empty($results)) {
+            $this->header("HTTP/1.1 404 Not Found");
+            $this->error("File not found");
+            $this->safeExit(0);
+        }
+
+        if ($requestDelegationCascade) {
+            $this->handleRequest();
+        }
+
+    }
+
+    /**
+     * Handles a GET request
+     *
+     * @return void but populates $this->JSON
+     */
+    public function handleGET()
+    {
+        $fullDir = $this->getFullPath();
+        ob_end_clean();
+
+        $fp = fopen($fullDir, "r");
+        if ($fp === false) {
+            $this->header("HTTP/1.1 500 Internal Server Error", true, 500);
+            error_log("Could not open $fullDir to send to client");
+            $this->safeExit(1);
+        }
+
+        $this->Header('Cache-control: private');
+
+        $mincHeader = $this->getHeader("header");
+
+        if (substr($mincHeader, 0, 4) === 'hdf5') {
+            $contentType = 'application/x.minc2';
+        } else {
+            $contentType = 'application/octet-stream';
+        }
+        $this->Header("Content-Type: $contentType");
+        $this->Header('Content-Length: '.filesize($fullDir));
+        $this->Header('Content-Disposition: filename='.$this->Filename);
+
+        while (!feof($fp)) {
+            print fread($fp, 1024);
+        }
+        $this->safeExit();
+    }
+
+    /**
+     * Gets an image's header from the database.
+     *
+     * @param string $headerName The header to retrieve for the current
+     *                           file
+     *
+     * @return string of the header value
+     */
+    protected function getHeader($headerName)
+    {
+        $factory = \NDB_Factory::singleton();
+        $db      = $factory->Database();
+
+        return $db->pselectOne(
+            "SELECT Value
+            FROM parameter_file pf 
+            JOIN parameter_type pt USING (ParameterTypeID)
+            JOIN files f USING (FileID)
+            JOIN session s ON (f.SessionID=s.ID)
+            JOIN candidate c ON (s.CandID=c.CandID)
+            WHERE c.Active='Y' AND s.Active='Y' AND c.CandID=:CID 
+                AND s.Visit_label=:VL 
+                AND f.File LIKE CONCAT('%', :Fname) AND pt.Name = :Header",
+            array(
+             'CID'    => $this->CandID,
+             'VL'     => $this->VisitLabel,
+             'Fname'  => $this->Filename,
+             'Header' => $headerName,
+            )
+        );
+
+    }
+
+    /**
+     * Calculate the entity tag for this image
+     *
+     * @return string
+     */
+    public function calculateETag()
+    {
+        return null;
+    }
+
+    /**
+     * Gets the full path of this image on the filesystem, in order
+     * to be able to pass it to an fopen command (or similar)
+     *
+     * @return string
+     */
+    protected function getFullPath()
+    {
+        return $this->getAssemblyRoot() . "/" . $this->getDatabaseDir();
+    }
+
+    /**
+     * Gets the root of the assembly directory, so that we know where
+     * to retrieve images relative to.
+     *
+     * @return string
+     */
+    protected function getAssemblyRoot()
+    {
+        $factory = \NDB_Factory::singleton();
+        $config  = $factory->Config();
+        return $config->getSetting("mincPath");
+    }
+
+    /**
+     * Gets the filename saved in the database for this file
+     *
+     * @return string
+     */
+    protected function getDatabaseDir()
+    {
+        $factory = \NDB_Factory::singleton();
+        $db      = $factory->Database();
+        return $db->pselectOne(
+            "SELECT File
+                FROM files f
+                    JOIN session s ON (f.SessionID=s.ID)
+                    JOIN candidate c ON (s.CandID=c.CandID)
+                WHERE c.Active='Y' AND s.Active='Y' 
+                    AND c.CandID=:CID AND s.Visit_label=:VL
+                    AND f.File LIKE CONCAT('%', :Fname)",
+            array(
+             'CID'   => $this->CandID,
+             'VL'    => $this->VisitLabel,
+             'Fname' => $this->Filename,
+            )
+        );
+    }
+}
+
+if (isset($_REQUEST['PrintImageData'])) {
+    $obj = new Image(
+        $_SERVER['REQUEST_METHOD'],
+        $_REQUEST['CandID'],
+        $_REQUEST['VisitLabel'],
+        $_REQUEST['Filename']
+    );
+    print $obj->toJSONString();
+}
+?>
diff --git a/htdocs/api/v0.0.3-dev/candidates/visits/images/format/BrainBrowser.php b/htdocs/api/v0.0.3-dev/candidates/visits/images/format/BrainBrowser.php
new file mode 100644
index 00000000000..b3c00073727
--- /dev/null
+++ b/htdocs/api/v0.0.3-dev/candidates/visits/images/format/BrainBrowser.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * Handles API requests for the candidate's visit
+ *
+ * PHP Version 5.5+
+ *
+ * @category Main
+ * @package  API
+ * @author   Dave MacFarlane <david.macfarlane2@mcgill.ca>
+ * @license  http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link     https://www.github.com/aces/Loris/
+ */
+namespace Loris\API\Candidates\Candidate\Visit\Imaging\Format;
+require_once __DIR__ . '/../Image.php';
+/**
+ * Handles API requests for the candidate's visit. Extends
+ * Candidate so that the constructor will validate the candidate
+ * portion of URL automatically.
+ *
+ * @category Main
+ * @package  API
+ * @author   Dave MacFarlane <david.macfarlane2@mcgill.ca>
+ * @license  http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link     https://www.github.com/aces/Loris/
+ */
+class BrainBrowser extends \Loris\API\Candidates\Candidate\Visit\Imaging\Image
+{
+    /**
+     * Construct a visit class object to serialize candidate visits
+     *
+     * @param string $method     The method of the HTTP request
+     * @param string $CandID     The CandID to be serialized
+     * @param string $VisitLabel The visit label to be serialized
+     * @param string $Filename   The filename whose brainbrowser data we want
+     */
+    public function __construct($method, $CandID, $VisitLabel, $Filename)
+    {
+        $requestDelegationCascade = $this->AutoHandleRequestDelegation;
+
+        $this->AutoHandleRequestDelegation = false;
+
+        if (empty($this->AllowedMethods)) {
+            $this->AllowedMethods = [
+                                     'GET',
+                                     'PUT',
+                                     'PATCH',
+                                    ];
+        }
+
+        parent::__construct($method, $CandID, $VisitLabel, $Filename);
+
+        if ($requestDelegationCascade) {
+            $this->handleRequest();
+        }
+
+    }
+
+    /**
+     * Helper function for handleGET to retrieve a dimension.
+     *
+     * @param string $dim The dimension to extract the headers for
+     *
+     * @return array
+     */
+    private function _getDimension($dim)
+    {
+        return [
+                'start'        => $this->getHeader("$dim:start"),
+                'space_length' => $this->getHeader("$dim:length"),
+                'step'         => $this->getHeader("$dim:step"),
+               ];
+    }
+
+    /**
+     * Handles a GET request
+     *
+     * @return void but populates $this->JSON
+     */
+    public function handleGET()
+    {
+        $order      = $this->getHeader("image:dimorder");
+        $orderArray = explode(",", $order);
+        $this->JSON = [
+                       'xspace' => $this->_getDimension("xspace"),
+                       'yspace' => $this->_getDimension("yspace"),
+                       "zspace" => $this->_getDimension("zspace"),
+                      ];
+        if (count($orderArray) === 4) {
+            $this->JSON['time'] = $this->_getDimension("time");
+        }
+        $this->JSON['order'] = $orderArray;
+    }
+
+    /**
+     * Extracts a header for this image from the database
+     *
+     * @param string $headerName The name of the header to extract
+     *
+     * @return string The Header value
+     */
+    protected function getHeader($headerName)
+    {
+        $factory = \NDB_Factory::singleton();
+        $db      = $factory->Database();
+
+        return $db->pselectOne(
+            "SELECT Value
+            FROM parameter_file pf 
+                JOIN parameter_type pt USING (ParameterTypeID)
+                JOIN files f USING (FileID)
+                JOIN session s ON (f.SessionID=s.ID)
+                JOIN candidate c ON (s.CandID=c.CandID)
+            WHERE c.Active='Y' AND s.Active='Y' 
+                AND c.CandID=:CID and s.Visit_label=:VL
+                AND f.File LIKE CONCAT('%', :Fname) AND pt.Name = :Header",
+            array(
+             'CID'    => $this->CandID,
+             'VL'     => $this->VisitLabel,
+             'Fname'  => $this->Filename,
+             'Header' => $headerName,
+            )
+        );
+
+    }
+
+    /**
+     * Calculate the entity tag for this URL.
+     *
+     * @return string
+     */
+    public function calculateETag()
+    {
+        return null;
+    }
+
+}
+
+if (isset($_REQUEST['PrintBBFormat'])) {
+    $obj = new BrainBrowser(
+        $_SERVER['REQUEST_METHOD'],
+        $_REQUEST['CandID'],
+        $_REQUEST['VisitLabel'],
+        $_REQUEST['Filename']
+    );
+    print $obj->toJSONString();
+}
+?>
diff --git a/htdocs/api/v0.0.3-dev/candidates/visits/images/format/Raw.php b/htdocs/api/v0.0.3-dev/candidates/visits/images/format/Raw.php
new file mode 100644
index 00000000000..f7423b7646a
--- /dev/null
+++ b/htdocs/api/v0.0.3-dev/candidates/visits/images/format/Raw.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * Handles API requests for the candidate's visit
+ *
+ * PHP Version 5.5+
+ *
+ * @category Main
+ * @package  API
+ * @author   Dave MacFarlane <david.macfarlane2@mcgill.ca>
+ * @license  http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link     https://www.github.com/aces/Loris/
+ */
+namespace Loris\API\Candidates\Candidate\Visit\Imaging\Format;
+require_once __DIR__ . '/../Image.php';
+/**
+ * Handles API requests for the candidate's visit. Extends
+ * Candidate so that the constructor will validate the candidate
+ * portion of URL automatically.
+ *
+ * @category Main
+ * @package  API
+ * @author   Dave MacFarlane <david.macfarlane2@mcgill.ca>
+ * @license  http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link     https://www.github.com/aces/Loris/
+ */
+class Raw extends \Loris\API\Candidates\Candidate\Visit\Imaging\Image
+{
+    /**
+     * Construct a visit class object to serialize candidate visits
+     *
+     * @param string $method     The method of the HTTP request
+     * @param string $CandID     The CandID to be serialized
+     * @param string $VisitLabel The visit label to be serialized
+     * @param string $Filename   The file name whose raw data we want
+     */
+    public function __construct($method, $CandID, $VisitLabel, $Filename)
+    {
+        $requestDelegationCascade = $this->AutoHandleRequestDelegation;
+
+        $this->AutoHandleRequestDelegation = false;
+
+        if (empty($this->AllowedMethods)) {
+            $this->AllowedMethods = ['GET'];
+        }
+
+        parent::__construct($method, $CandID, $VisitLabel, $Filename);
+
+        if ($requestDelegationCascade) {
+            $this->handleRequest();
+        }
+
+    }
+
+    /**
+     * Handles a GET request
+     *
+     * @return void but populates $this->JSON
+     */
+    public function handleGET()
+    {
+        $mincfile = $this->getFullPath();
+        if (`which minctoraw`) {
+            $this->Header("Content-Type: application/x.raw");
+            passthru(
+                "minctoraw -byte -unsigned -normalize "
+                . escapeshellarg($mincfile)
+            );
+            $this->safeExit(0);
+        }
+
+        $this->header("HTTP/1.1 500 Internal Server Error", true, 500);
+        $this->error("Minc Tools not installed on server");
+    }
+
+
+    /**
+     * Calculate the entity tag for this URL
+     *
+     * @return string
+     */
+    public function calculateETag()
+    {
+        return null;
+    }
+}
+
+if (isset($_REQUEST['PrintRawFormat'])) {
+    $obj = new Raw(
+        $_SERVER['REQUEST_METHOD'],
+        $_REQUEST['CandID'],
+        $_REQUEST['VisitLabel'],
+        $_REQUEST['Filename']
+    );
+}
+?>
diff --git a/htdocs/api/v0.0.3-dev/candidates/visits/images/format/Thumbnail.php b/htdocs/api/v0.0.3-dev/candidates/visits/images/format/Thumbnail.php
new file mode 100644
index 00000000000..40d1480d321
--- /dev/null
+++ b/htdocs/api/v0.0.3-dev/candidates/visits/images/format/Thumbnail.php
@@ -0,0 +1,118 @@
+<?php
+/**
+ * Handles API requests for the candidate's visit
+ *
+ * PHP Version 5.5+
+ *
+ * @category Main
+ * @package  API
+ * @author   Dave MacFarlane <david.macfarlane2@mcgill.ca>
+ * @license  http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link     https://www.github.com/aces/Loris/
+ */
+namespace Loris\API\Candidates\Candidate\Visit\Imaging\Format;
+require_once __DIR__ . '/../Image.php';
+/**
+ * Handles API requests for the candidate's visit. Extends
+ * Candidate so that the constructor will validate the candidate
+ * portion of URL automatically.
+ *
+ * @category Main
+ * @package  API
+ * @author   Dave MacFarlane <david.macfarlane2@mcgill.ca>
+ * @license  http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link     https://www.github.com/aces/Loris/
+ */
+class Thumbnail extends \Loris\API\Candidates\Candidate\Visit\Imaging\Image
+{
+    /**
+     * Construct a visit class object to serialize candidate visits
+     *
+     * @param string $method     The method of the HTTP request
+     * @param string $CandID     The CandID to be serialized
+     * @param string $VisitLabel The visit label to be serialized
+     * @param string $Filename   The file whose thumbnail we want
+     */
+    public function __construct($method, $CandID, $VisitLabel, $Filename)
+    {
+        $requestDelegationCascade = $this->AutoHandleRequestDelegation;
+
+        $this->AutoHandleRequestDelegation = false;
+
+        if (empty($this->AllowedMethods)) {
+            $this->AllowedMethods = ['GET'];
+        }
+
+        parent::__construct($method, $CandID, $VisitLabel, $Filename);
+
+        if ($requestDelegationCascade) {
+            $this->handleRequest();
+        }
+
+    }
+
+    /**
+     * Handles a GET request
+     *
+     * @return void but populates $this->JSON
+     */
+    public function handleGET()
+    {
+        $FullPath = $this->getFullPath();
+        $fp       = fopen($FullPath, 'r');
+        if ($fp !== false) {
+            $this->Header("Content-Type: image/jpeg");
+            fpassthru($fp);
+            fclose($fp);
+            $this->safeExit(0);
+        } else {
+            $this->header("HTTP/1.1 500 Internal Server Error", true, 500);
+            $this->error("Could not load thumbnail file");
+            $this->safeExit(1);
+        }
+    }
+
+    /**
+     * Calculate the entity tag for this URL
+     *
+     * @return string
+     */
+    public function calculateETag()
+    {
+        return null;
+    }
+
+    /**
+     * Get the root directory that images are stored under.
+     *
+     * @return string a directory on the server
+     */
+    protected function getAssemblyRoot()
+    {
+        $factory = \NDB_Factory::singleton();
+        $config  = $factory->Config();
+        return $config->getSetting("imagePath") . "/pic/";
+    }
+
+    /**
+     * Get the filename under the assemblyRoot that the image
+     * is stored at.
+     *
+     * @return string
+     */
+    protected function getDatabaseDir()
+    {
+        return $this->getHeader("check_pic_filename");
+    }
+
+}
+
+if (isset($_REQUEST['PrintThumbnailFormat'])) {
+    $obj = new Thumbnail(
+        $_SERVER['REQUEST_METHOD'],
+        $_REQUEST['CandID'],
+        $_REQUEST['VisitLabel'],
+        $_REQUEST['Filename']
+    );
+}
+?>
diff --git a/htdocs/api/v0.0.3-dev/candidates/visits/images/headers/Full.php b/htdocs/api/v0.0.3-dev/candidates/visits/images/headers/Full.php
new file mode 100644
index 00000000000..3490dc574b3
--- /dev/null
+++ b/htdocs/api/v0.0.3-dev/candidates/visits/images/headers/Full.php
@@ -0,0 +1,146 @@
+<?php
+/**
+ * Handles API requests for the candidate's visit
+ *
+ * PHP Version 5.5+
+ *
+ * @category Main
+ * @package  API
+ * @author   Dave MacFarlane <david.macfarlane2@mcgill.ca>
+ * @license  http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link     https://www.github.com/aces/Loris/
+ */
+namespace Loris\API\Candidates\Candidate\Visit\Imaging\Headers;
+require_once __DIR__ . '/../Image.php';
+/**
+ * Handles API requests for the candidate's visit. Extends
+ * Candidate so that the constructor will validate the candidate
+ * portion of URL automatically.
+ *
+ * @category Main
+ * @package  API
+ * @author   Dave MacFarlane <david.macfarlane2@mcgill.ca>
+ * @license  http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link     https://www.github.com/aces/Loris/
+ */
+class Full extends \Loris\API\Candidates\Candidate\Visit\Imaging\Image
+{
+    /**
+     * Construct a visit class object to serialize candidate visits
+     *
+     * @param string $method     The method of the HTTP request
+     * @param string $CandID     The CandID to be serialized
+     * @param string $VisitLabel The visit label to be serialized
+     * @param string $Filename   The filename being retrieved
+     */
+    public function __construct($method, $CandID, $VisitLabel, $Filename)
+    {
+        $requestDelegationCascade = $this->AutoHandleRequestDelegation;
+
+        $this->AutoHandleRequestDelegation = false;
+
+        if (empty($this->AllowedMethods)) {
+            $this->AllowedMethods = [
+                                     'GET',
+                                     'PUT',
+                                     'PATCH',
+                                    ];
+        }
+
+        parent::__construct($method, $CandID, $VisitLabel, $Filename);
+
+        if ($requestDelegationCascade) {
+            $this->handleRequest();
+        }
+
+    }
+
+    /**
+     * Handles a GET request
+     *
+     * @return void but populates $this->JSON
+     */
+    public function handleGET()
+    {
+        $headersDB = $this->getHeaders();
+
+        $headers = [];
+        foreach ($headersDB as $row) {
+            $headers[$row['Header']] = $row['Value'];
+        }
+        $this->JSON = [
+                       'Meta'    => [
+                                     'CandID'   => $this->CandID,
+                                     'Visit'    => $this->VisitLabel,
+                                     'Filename' => $this->Filename,
+                                    ],
+                       "Headers" => $headers,
+                      ];
+    }
+
+    /**
+     * Retrieves all headers for this file from the database.
+     *
+     * @return array
+     */
+    protected function getHeaders()
+    {
+        $factory = \NDB_Factory::singleton();
+        $db      = $factory->Database();
+
+        // Get all fields from parameter_type "magically created by
+        // neurodb", since those are the dicom headers.
+        // There's a few headers that get magically created which
+        // aren't header fields, so we manually exclude them.
+        // Namely:
+        //
+        // md5hash, tarchiveMD5, image_comments, check_pic_filename,
+        // jiv_path
+        return $db->pselect(
+            "SELECT pt.Name as Header, Value
+            FROM parameter_file pf 
+                JOIN parameter_type pt USING (ParameterTypeID)
+                JOIN files f USING (FileID)
+                JOIN session s ON (f.SessionID=s.ID)
+                JOIN candidate c ON (s.CandID=c.CandID)
+            WHERE c.Active='Y' AND s.Active='Y' AND c.CandID=:CID AND 
+                s.Visit_label=:VL AND f.File LIKE CONCAT('%', :Fname) 
+                AND pt.Description LIKE '%magically%'
+                AND pt.Name NOT IN (
+                    'md5hash',
+                    'tarchiveMD5',
+                    'image_comments',
+                    'check_pic_filename',
+                    'jiv_path'
+                )
+                ",
+            array(
+             'CID'   => $this->CandID,
+             'VL'    => $this->VisitLabel,
+             'Fname' => $this->Filename,
+            )
+        );
+
+    }
+
+    /**
+     * Calculate the entity tag for this URL
+     *
+     * @return string
+     */
+    public function calculateETag()
+    {
+        return null;
+    }
+}
+
+if (isset($_REQUEST['PrintHeadersFull'])) {
+    $obj = new Full(
+        $_SERVER['REQUEST_METHOD'],
+        $_REQUEST['CandID'],
+        $_REQUEST['VisitLabel'],
+        $_REQUEST['Filename']
+    );
+    print $obj->toJSONString();
+}
+?>
diff --git a/htdocs/api/v0.0.3-dev/candidates/visits/images/headers/Headers.php b/htdocs/api/v0.0.3-dev/candidates/visits/images/headers/Headers.php
new file mode 100644
index 00000000000..fa7370a1bf2
--- /dev/null
+++ b/htdocs/api/v0.0.3-dev/candidates/visits/images/headers/Headers.php
@@ -0,0 +1,135 @@
+<?php
+/**
+ * Handles API requests for the candidate's visit
+ *
+ * PHP Version 5.5+
+ *
+ * @category Main
+ * @package  API
+ * @author   Dave MacFarlane <david.macfarlane2@mcgill.ca>
+ * @license  http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link     https://www.github.com/aces/Loris/
+ */
+namespace Loris\API\Candidates\Candidate\Visit\Imaging\Headers;
+require_once __DIR__ . '/../Image.php';
+/**
+ * Handles API requests for the candidate's visit. Extends
+ * Candidate so that the constructor will validate the candidate
+ * portion of URL automatically.
+ *
+ * @category Main
+ * @package  API
+ * @author   Dave MacFarlane <david.macfarlane2@mcgill.ca>
+ * @license  http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link     https://www.github.com/aces/Loris/
+ */
+class Headers extends \Loris\API\Candidates\Candidate\Visit\Imaging\Image
+{
+    /**
+     * Construct a visit class object to serialize candidate visits
+     *
+     * @param string $method     The method of the HTTP request
+     * @param string $CandID     The CandID to be serialized
+     * @param string $VisitLabel The visit label to be serialized
+     * @param string $Filename   The filename whose headers we want
+     */
+    public function __construct($method, $CandID, $VisitLabel, $Filename)
+    {
+        $requestDelegationCascade = $this->AutoHandleRequestDelegation;
+
+        $this->AutoHandleRequestDelegation = false;
+
+        if (empty($this->AllowedMethods)) {
+            $this->AllowedMethods = [
+                                     'GET',
+                                     'PUT',
+                                     'PATCH',
+                                    ];
+        }
+
+        parent::__construct($method, $CandID, $VisitLabel, $Filename);
+
+        if ($requestDelegationCascade) {
+            $this->handleRequest();
+        }
+
+    }
+
+    /**
+     * Handles a GET request
+     *
+     * @return void but populates $this->JSON
+     */
+    public function handleGET()
+    {
+        $TE = $this->getHeader('acquisition:echo_time');
+        $TR = $this->getHeader('acquisition:repetition_time');
+        $TI = $this->getHeader('acquisition:inversion_time');
+        $ST = $this->getHeader('acquisition:slice_thickness');
+
+        $SeriesName        =  $this->getHeader("acquisition:protocol");
+        $SeriesDescription = $this->getHeader("acquisition:series_description");
+
+        $XSpace     = [
+                       "Length"   => $this->getHeader("xspace:length"),
+                       "StepSize" => $this->getHeader("xspace:step"),
+                      ];
+        $YSpace     = [
+                       "Length"   => $this->getHeader("yspace:length"),
+                       "StepSize" => $this->getHeader("yspace:step"),
+                      ];
+        $ZSpace     = [
+                       "Length"   => $this->getHeader("zspace:length"),
+                       "StepSize" => $this->getHeader("zspace:step"),
+                      ];
+        $TimeD      = [
+                       "Length"   => $this->getHeader("time:length"),
+                       "StepSize" => $this->getHeader("time:step"),
+                      ];
+        $this->JSON = [
+                       'Meta'        => [
+                                         'CandID'   => $this->CandID,
+                                         'Visit'    => $this->VisitLabel,
+                                         'Filename' => $this->Filename,
+                                        ],
+                       'Physical'    => [
+                                         "TE"             => $TE,
+                                         "TR"             => $TR,
+                                         "TI"             => $TI,
+                                         "SliceThickness" => $ST,
+                                        ],
+                       'Description' => [
+                                         "SeriesName"        => $SeriesName,
+                                         "SeriesDescription" => $SeriesDescription,
+                                        ],
+                       'Dimensions'  => [
+                                         "XSpace"        => $XSpace,
+                                         "YSpace"        => $YSpace,
+                                         "ZSpace"        => $ZSpace,
+                                         "TimeDimension" => $TimeD,
+                                        ],
+
+                      ];
+    }
+
+    /**
+     * Calculate the entity tag for this URL
+     *
+     * @return string
+     */
+    public function calculateETag()
+    {
+        return null;
+    }
+}
+
+if (isset($_REQUEST['PrintHeadersSummary'])) {
+    $obj = new Headers(
+        $_SERVER['REQUEST_METHOD'],
+        $_REQUEST['CandID'],
+        $_REQUEST['VisitLabel'],
+        $_REQUEST['Filename']
+    );
+    print $obj->toJSONString();
+}
+?>
diff --git a/htdocs/api/v0.0.3-dev/candidates/visits/images/headers/Specific.php b/htdocs/api/v0.0.3-dev/candidates/visits/images/headers/Specific.php
new file mode 100644
index 00000000000..fa8912c1283
--- /dev/null
+++ b/htdocs/api/v0.0.3-dev/candidates/visits/images/headers/Specific.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Handles API requests for the candidate's visit
+ *
+ * PHP Version 5.5+
+ *
+ * @category Main
+ * @package  API
+ * @author   Dave MacFarlane <david.macfarlane2@mcgill.ca>
+ * @license  http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link     https://www.github.com/aces/Loris/
+ */
+namespace Loris\API\Candidates\Candidate\Visit\Imaging\Headers;
+require_once __DIR__ . '/../Image.php';
+/**
+ * Handles API requests for the candidate's visit. Extends
+ * Candidate so that the constructor will validate the candidate
+ * portion of URL automatically.
+ *
+ * @category Main
+ * @package  API
+ * @author   Dave MacFarlane <david.macfarlane2@mcgill.ca>
+ * @license  http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link     https://www.github.com/aces/Loris/
+ */
+class SpecificHeader extends \Loris\API\Candidates\Candidate\Visit\Imaging\Image
+{
+    /**
+     * Construct a visit class object to serialize candidate visits
+     *
+     * @param string $method     The method of the HTTP request
+     * @param string $CandID     The CandID to be serialized
+     * @param string $VisitLabel The visit label to be serialized
+     * @param string $Filename   The file to retrieve the header for
+     * @param string $Header     The header field to extract
+     */
+    public function __construct($method, $CandID, $VisitLabel, $Filename, $Header)
+    {
+        $requestDelegationCascade = $this->AutoHandleRequestDelegation;
+
+        $this->AutoHandleRequestDelegation = false;
+
+        if (empty($this->AllowedMethods)) {
+            $this->AllowedMethods = ['GET'];
+        }
+
+        parent::__construct($method, $CandID, $VisitLabel, $Filename);
+
+        $this->Header = $Header;
+
+        if ($requestDelegationCascade) {
+            $this->handleRequest();
+        }
+
+    }
+
+    /**
+     * Handles a GET request
+     *
+     * @return void but populates $this->JSON
+     */
+    public function handleGET()
+    {
+
+        foreach ($headersDB as $row) {
+            $headers[$row['Header']] = $row['Value'];
+        }
+        $this->JSON = [
+                       'Meta'  => [
+                                   'CandID'   => $this->CandID,
+                                   'Visit'    => $this->VisitLabel,
+                                   'Filename' => $this->Filename,
+                                   "Header"   => $this->Header,
+                                  ],
+                       "Value" => $this->getHeader($this->Header),
+                      ];
+    }
+
+    /**
+     * Calculate the ETag for this header
+     *
+     * @return string
+     */
+    public function calculateETag()
+    {
+        return null;
+    }
+}
+
+if (isset($_REQUEST['PrintSpecificHeader'])) {
+    $obj = new SpecificHeader(
+        $_SERVER['REQUEST_METHOD'],
+        $_REQUEST['CandID'],
+        $_REQUEST['VisitLabel'],
+        $_REQUEST['Filename'],
+        $_REQUEST['Header']
+    );
+    print $obj->toJSONString();
+}
+?>
diff --git a/htdocs/api/v0.0.3-dev/candidates/visits/images/qc/QC.php b/htdocs/api/v0.0.3-dev/candidates/visits/images/qc/QC.php
new file mode 100644
index 00000000000..bbb77196c00
--- /dev/null
+++ b/htdocs/api/v0.0.3-dev/candidates/visits/images/qc/QC.php
@@ -0,0 +1,237 @@
+<?php
+/**
+ * Handles API requests for the candidate's visit
+ *
+ * PHP Version 5.5+
+ *
+ * @category Main
+ * @package  API
+ * @author   Dave MacFarlane <david.macfarlane2@mcgill.ca>
+ * @license  http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link     https://www.github.com/aces/Loris/
+ */
+namespace Loris\API\Candidates\Candidate\Visit\Imaging\Qc;
+require_once __DIR__ . '/../Image.php';
+/**
+ * Handles API requests for the candidate's visit. Extends
+ * Candidate so that the constructor will validate the candidate
+ * portion of URL automatically.
+ *
+ * @category Main
+ * @package  API
+ * @author   Dave MacFarlane <david.macfarlane2@mcgill.ca>
+ * @license  http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link     https://www.github.com/aces/Loris/
+ */
+class QC extends \Loris\API\Candidates\Candidate\Visit\Imaging\Image
+{
+    /**
+     * Construct an Image class object to serialize candidate images
+     *
+     * @param string $method     The method of the HTTP request
+     * @param string $CandID     The CandID to be serialized
+     * @param string $VisitLabel The visit label to be serialized
+     * @param string $Filename   The file name to be serialized
+     */
+    public function __construct($method, $CandID, $VisitLabel, $Filename)
+    {
+        $requestDelegationCascade = $this->AutoHandleRequestDelegation;
+
+        $this->AutoHandleRequestDelegation = false;
+
+        if (empty($this->AllowedMethods)) {
+            $this->AllowedMethods = [
+                                     'GET',
+                                     'PUT',
+                                    ];
+        }
+
+        parent::__construct($method, $CandID, $VisitLabel, $Filename);
+
+        if ($requestDelegationCascade) {
+            $this->handleRequest();
+        }
+
+    }
+
+    /**
+     * Handles a GET request
+     *
+     * @return void but populates $this->JSON
+     */
+    public function handleGET()
+    {
+        $factory    = \NDB_Factory::singleton();
+        $DB         = $factory->Database();
+        $QCStatus   = $DB->pselectRow(
+            "SELECT QCStatus, 
+                pf.Value as Selected FROM files f
+                LEFT JOIN files_qcstatus fqc ON (f.FileID=fqc.FileID)
+                LEFT JOIN parameter_file pf ON (f.FileID=pf.FileID)
+                LEFT JOIN parameter_type pt 
+                    ON (pf.ParameterTypeID=pt.ParameterTypeID AND pt.Name='Selected')
+                WHERE f.File LIKE CONCAT('%', :FName)",
+            array('FName' => $this->Filename)
+        );
+        $this->JSON = [
+                       'Meta'     => [
+                                      'CandID' => $this->CandID,
+                                      'Visit'  => $this->VisitLabel,
+                                      'File'   => $this->Filename,
+                                     ],
+                       'QC'       => $QCStatus['QCStatus'],
+                       'Selected' => $QCStatus['Selected'],
+                      ];
+    }
+
+    /**
+     * Calculates the ETag for the current QC status
+     *
+     * @return string
+     */
+    public function calculateETag()
+    {
+        return "";
+    }
+
+    /**
+     * Handles a PUT request for QC data
+     *
+     * @return void
+     */
+    public function handlePUT()
+    {
+        $fp   = fopen("php://input", "r");
+        $data = '';
+        while (!feof($fp)) {
+            $data .= fread($fp, 1024);
+        }
+        fclose($fp);
+
+        //parse_str(urldecode($data), $data);
+        $data = json_decode($data, true);
+        if (!isset($data['Meta']['CandID'])
+            || $data['Meta']['CandID'] != $this->CandID
+        ) {
+                $this->header("HTTP/1.1 400 Bad Request");
+                $this->error("Candidate from URL does not match JSON metadata.");
+                $this->safeExit(0);
+        }
+        if (!isset($data['Meta']['Visit'])
+            || $data['Meta']['Visit'] != $this->VisitLabel
+        ) {
+                $this->header("HTTP/1.1 400 Bad Request");
+                $this->error("Visit from URL does not match JSON metadata");
+                $this->safeExit(0);
+        }
+        if (!isset($data['Meta']['File'])
+            || $data['Meta']['File'] != $this->Filename
+        ) {
+                $this->header("HTTP/1.1 400 Bad Request");
+                $this->error("File name from URL does not match JSON metadata");
+                $this->safeExit(0);
+        }
+
+        if (!isset($data['QCStatus'])) {
+                $this->header("HTTP/1.1 400 Bad Request");
+                $this->error("Missing QCStatus to save.");
+                $this->safeExit(0);
+        }
+        if ($data['QCStatus'] != "Pass" && $data['QCStatus'] != "Fail") {
+                $this->header("HTTP/1.1 400 Bad Request");
+                $this->error("Invalid value for QCStatus . Must be Pass or Fail.");
+                $this->safeExit(0);
+        }
+        if (!isset($data['Selected'])) {
+                $this->header("HTTP/1.1 400 Bad Request");
+                $this->error("Missing Selected flag.");
+                $this->safeExit(0);
+        }
+
+        // We know that it's set to something, because we checked above, so verify
+        // that Pending is a valid value.
+        // true is equal to "true", but false is not equal to "false".
+        if ($data['Selected'] != "true"
+            && $data['Selected'] != "false"
+            && $data['Selected'] !== false
+        ) {
+                $this->header("HTTP/1.1 400 Bad Request");
+                $this->error("Invalid value for Selected. Must be true or false.");
+                $this->safeExit(0);
+        }
+
+        $selval = "";
+        // don't need to handle false, because $selval was initialized to the empty
+        // string (which is what // false would save..
+        if ($data['Selected'] == "true") {
+            $factory = \NDB_Factory::singleton();
+            $DB      = $factory->Database();
+            $selval  = $DB->pselectOne(
+                "SELECT mst.Scan_type 
+                 FROM files f 
+                    LEFT JOIN mri_scan_type mst ON (f.AcquisitionProtocolID=mst.ID)
+                 WHERE f.File LIKE CONCAT('%', :FName)",
+                array('FName' => $this->Filename)
+            );
+
+        }
+        $this->_saveFileQC($data['QCStatus'], $selval);
+
+        $this->JSON = ['success' => 'Updated file QC information'];
+
+    }
+
+    /**
+     * Save the QC value to the database. Only call this after everything
+     * has been validated
+     *
+     * @param string $qcval  The Pass/Fail status
+     * @param string $selval The value to set the selected field to.
+     *
+     * @return void
+     */
+    private function _saveFileQC($qcval, $selval)
+    {
+        $factory = \NDB_Factory::singleton();
+        $DB      = $factory->Database();
+        $FileID  = $DB->pselectOne(
+            "SELECT f.FileID FROM files f
+                WHERE f.File LIKE CONCAT('%', :FName)",
+            array('FName' => $this->Filename)
+        );
+        $AlreadySavedQC = $DB->pselectOne(
+            "SELECT COUNT(*) FROM files_qcstatus WHERE FileID=:FID",
+            array('FID' => $FileID)
+        );
+        if ($AlreadySavedQC > 0) {
+            $DB->update(
+                "files_qcstatus",
+                [
+                 'QCStatus' => $qcval,
+                 'Selected' => $selval,
+                ],
+                ['FileID' => $FileID]
+            );
+        } else {
+            $DB->insert(
+                "files_qcstatus",
+                [
+                 'QCStatus' => $qcval,
+                 'Selected' => $selval,
+                 'FileID'   => $FileID,
+                ]
+            );
+        }
+    }
+}
+
+if (isset($_REQUEST['PrintImageQC'])) {
+    $obj = new QC(
+        $_SERVER['REQUEST_METHOD'],
+        $_REQUEST['CandID'],
+        $_REQUEST['VisitLabel'],
+        $_REQUEST['Filename']
+    );
+    print $obj->toJSONString();
+}
+?>
diff --git a/htdocs/api/v0.0.3-dev/candidates/visits/qc/Imaging.php b/htdocs/api/v0.0.3-dev/candidates/visits/qc/Imaging.php
new file mode 100644
index 00000000000..d8102222249
--- /dev/null
+++ b/htdocs/api/v0.0.3-dev/candidates/visits/qc/Imaging.php
@@ -0,0 +1,219 @@
+<?php
+/**
+ * Handles API requests for the candidate's visit
+ *
+ * PHP Version 5.5+
+ *
+ * @category Main
+ * @package  API
+ * @author   Dave MacFarlane <david.macfarlane2@mcgill.ca>
+ * @license  http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link     https://www.github.com/aces/Loris/
+ */
+namespace Loris\API\Candidates\Candidate\Visit\QC;
+require_once '../../Visit.php';
+/**
+ * Handles API requests for the candidate's visit. Extends
+ * Candidate so that the constructor will validate the candidate
+ * portion of URL automatically.
+ *
+ * @category Main
+ * @package  API
+ * @author   Dave MacFarlane <david.macfarlane2@mcgill.ca>
+ * @license  http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link     https://www.github.com/aces/Loris/
+ */
+class Imaging extends \Loris\API\Candidates\Candidate\Visit
+{
+    /**
+     * Construct a visit class object to serialize candidate visits
+     *
+     * @param string $method     The method of the HTTP request
+     * @param string $CandID     The CandID to be serialized
+     * @param string $VisitLabel The visit label to be serialized
+     */
+    public function __construct($method, $CandID, $VisitLabel)
+    {
+        $requestDelegationCascade = $this->AutoHandleRequestDelegation;
+
+        $this->AutoHandleRequestDelegation = false;
+
+        if (empty($this->AllowedMethods)) {
+            $this->AllowedMethods = [
+                                     'GET',
+                                     'PUT',
+                                    ];
+        }
+        $this->CandID     = $CandID;
+        $this->VisitLabel = $VisitLabel;
+
+        // Parent constructor will handle validation of
+        // CandID and VisitLabel
+        parent::__construct($method, $CandID, $VisitLabel);
+
+        if ($requestDelegationCascade) {
+            $this->handleRequest();
+        }
+
+    }
+
+    /**
+     * Handles a GET request
+     *
+     * @return void but populates $this->JSON
+     */
+    public function handleGET()
+    {
+        $factory   = \NDB_Factory::singleton();
+        $DB        = $factory->database();
+         $qcstatus = $DB->pselectRow(
+             "SELECT MRIQCStatus, MRIQCPending 
+             FROM session s JOIN candidate c ON (c.CandID=s.CandID) 
+             WHERE c.Active='Y' AND s.Active='Y'
+             AND s.Visit_label=:VL AND c.CandID=:CID",
+             array(
+              'VL'  => $this->VisitLabel,
+              'CID' => $this->CandID,
+             )
+         );
+
+         $this->JSON = [
+                        'Meta' => [
+                                   'CandID' => $this->CandID,
+                                   'Visit'  => $this->VisitLabel,
+                                  ],
+                       ];
+
+         $this->JSON['SessionQC'] = $qcstatus['MRIQCStatus'];
+         $this->JSON['Pending']   = $qcstatus['MRIQCPending'] === 'N' ? false : true;
+
+    }
+
+    /**
+     * Calculate the ETag for the current QC status
+     *
+     * @return string The JSON's entity tag
+     */
+    public function calculateETag()
+    {
+        // mod_rewrite seems to be eatting the ETag for some reason that I won't
+        // be able to figure out in time for the release.
+        // Return a null ETag so that PUT requests can be processed.
+        return null;
+    }
+
+    /**
+     * Handle a PUT request by validating the metadata matches the URL
+     * and updating the database
+     *
+     * @return void
+     */
+    public function handlePUT()
+    {
+        $fp   = fopen("php://input", "r");
+        $data = '';
+        while (!feof($fp)) {
+            $data .= fread($fp, 1024);
+        }
+        fclose($fp);
+
+        //parse_str(urldecode($data), $data);
+        $data = json_decode($data, true);
+        if (!isset($data['Meta']['CandID'])
+            || $data['Meta']['CandID'] != $this->CandID
+        ) {
+                $this->header("HTTP/1.1 400 Bad Request");
+                $this->error("Candidate from URL does not match metadata.");
+                $this->safeExit(0);
+        }
+        if (!isset($data['Meta']['Visit'])
+            || $data['Meta']['Visit'] != $this->VisitLabel
+        ) {
+                $this->header("HTTP/1.1 400 Bad Request");
+                $this->error("Visit from URL does not match metadata");
+                $this->safeExit(0);
+        }
+
+        if (!isset($data['SessionQC'])) {
+                $this->header("HTTP/1.1 400 Bad Request");
+                $this->error("Missing SessionQC to save.");
+                $this->safeExit(0);
+        }
+        if ($data['SessionQC'] != "Pass"
+            && $data['SessionQC'] != "Fail"
+            && !empty($data['SessionQC'])
+        ) {
+                $this->header("HTTP/1.1 400 Bad Request");
+                $this->error(
+                    "Invalid value for SessionQC."
+                    . " Must be Pass, Fail, or the empty string."
+                );
+                $this->safeExit(0);
+        }
+        if (!isset($data['Pending'])) {
+                $this->header("HTTP/1.1 400 Bad Request");
+                $this->error("Missing Pending flag.");
+                $this->safeExit(0);
+        }
+
+        // We know that it's set to something, because we checked above,
+        // so verify that Pending is a valid value.
+        // true is equal to "true", but false is not equal to "false".
+        if ($data['Pending'] != "true"
+            && $data['Pending'] != "false"
+            && $data['Pending'] !== false
+        ) {
+                $this->header("HTTP/1.1 400 Bad Request");
+                $this->error("Invalid value for Pending. Must be true or false.");
+                $this->safeExit(0);
+        }
+
+        switch( $data['Pending'] ){
+        case 'true':
+            $savePending = 'Y';
+            break;
+        case 'false':
+        case false:
+            $savePending = 'N';
+            break;
+        default:
+            $savePending = null;
+        }
+
+        // Manually extract the sessionID with a select statement,
+        // since the keys used to look it up are in different tables
+        // and we can't join in the update wrapper.
+        $factory     = \NDB_Factory::singleton();
+        $DB          = $factory->database();
+         $sessionID  = $DB->pselectOne(
+             "SELECT s.ID
+               FROM session s 
+                 JOIN candidate c ON (c.CandID=s.CandID) 
+               WHERE c.Active='Y' AND s.Active='Y'
+                 AND s.Visit_label=:VL AND c.CandID=:CID",
+             array(
+              'VL'  => $this->VisitLabel,
+              'CID' => $this->CandID,
+             )
+         );
+         $qcstatus   = $DB->update(
+             'session',
+             [
+              'MRIQCStatus'  => $data['SessionQC'],
+              'MRIQCPending' => $savePending,
+             ],
+             ['ID' => $sessionID]
+         );
+         $this->JSON = ["success" => "Updated QC"];
+    }
+}
+
+if (isset($_REQUEST['PrintQC'])) {
+    $obj = new Imaging(
+        $_SERVER['REQUEST_METHOD'],
+        $_REQUEST['CandID'],
+        $_REQUEST['VisitLabel']
+    );
+    print $obj->toJSONString();
+}
+?>
diff --git a/htdocs/api/v0.0.3-dev/projects/Images.php b/htdocs/api/v0.0.3-dev/projects/Images.php
new file mode 100644
index 00000000000..277874cc617
--- /dev/null
+++ b/htdocs/api/v0.0.3-dev/projects/Images.php
@@ -0,0 +1,177 @@
+<?php
+/**
+ * Handles a request to the project's images portion of the Loris API
+ *
+ * PHP Version 7
+ *
+ * @category Main
+ * @package  API
+ * @author   Xavier Lecours Boucher <xavier.lecoursboucher@mcgill.ca>
+ * @license  http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link     https://www.github.com/aces/Loris/
+ */
+
+namespace Loris\API\Projects;
+//Load config file and ensure paths are correct
+set_include_path(get_include_path() . ":" . __DIR__ . "/../");
+
+require_once 'APIBase.php';
+
+/**
+ * Class to handle project's images portion of the Loris API
+ *
+ * @category Main
+ * @package  API
+ * @author   Xavier Lecours Boucher <xavier.lecoursboucher@mcgill.ca>
+ * @license  http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link     https://www.github.com/aces/Loris/
+ */
+class Images extends \Loris\API\APIBase
+{
+    var $RequestData;
+    private $_project;
+
+    /**
+     * Create a Candidates request handler
+     *
+     * @param string $method The HTTP request method of the request
+     * @param array  $data   The data that was POSTed to the request
+     */
+    public function __construct($method, $data=null)
+    {
+
+        $this->AllowedMethods = array('GET');
+        $this->AutoHandleRequestDelegation = false;
+
+        parent::__construct($method);
+
+        $projectName = $data['project_name'];
+
+        try {
+            $this->_project = $this->Factory->project($projectName);
+        } catch (\LorisException $e) {
+            $this->header("HTTP/1.1 404 Not Found");
+            $this->error(['error' => 'Invalid project']);
+            $this->safeExit(0);
+        }
+
+        try {
+            $dateString = $data['since'] ?? '1970-01-01';
+            $this->RequestData['since'] = new \DateTime($dateString);
+        } catch(\Exception $e) {
+            $this->header("HTTP/1.1 400 Bad Request");
+            $this->error(['error' => 'Invalid date']);
+            $this->safeExit(0);
+        }
+
+        $this->handleRequest();
+
+    }
+
+    /**
+     * Calculate an ETag by taking a hash of the number of candidates in the
+     * database and the time of the most recently changed one.
+     *
+     * @return string An ETag for ths candidates object
+     */
+    function calculateETag()
+    {
+        $ETagCriteria = $this->DB->pselectRow(
+            "SELECT MAX(f.InsertTime) as Time,
+                    COUNT(1) as NumImages
+             FROM files f
+             JOIN session s ON (f.SessionID = s.ID)
+             JOIN candidate c USING (CandID)
+             JOIN Project p USING (ProjectID)
+             WHERE
+                  f.InsertTime > :v_time AND
+                  p.Name = :v_project_name",
+            array(
+             'v_time'         => $this->RequestData['since']->getTimestamp(),
+             'v_project_name' => $this->_project->getName(),
+            )
+        );
+        return md5(
+            'Images:'
+            . $ETagCriteria['Time']
+            . ':' . $ETagCriteria['NumImages']
+        );
+    }
+    /**
+     * Handles a candidates GET request
+     *
+     * @return void but populates $this->JSON
+     */
+    public function handleGET()
+    {
+        $result = $this->DB->pselect(
+            "SELECT
+               s.CandID,
+               c.PSCID,
+               s.Visit_label,
+               s.Date_visit,
+               p.Name as SiteName,
+               f.File,
+               f.InsertTime,
+               mst.Scan_type,
+               qc.QCStatus,
+               qc.Selected
+             FROM files f 
+             LEFT JOIN mri_scan_type mst
+               ON (mst.ID = f.AcquisitionProtocolID)
+             LEFT JOIN session s
+               ON (f.SessionID = s.ID)
+             LEFT JOIN candidate c
+               USING (CandID)
+             LEFT JOIN psc p
+               ON (s.CenterID = p.CenterID)
+             LEFT JOIN files_qcstatus qc
+               USING (FileID)
+             WHERE
+                  c.Active = 'Y' AND
+                  f.InsertTime > :v_time
+             ORDER BY f.InsertTime ASC",
+            array('v_time' => $this->RequestData['since']->getTimestamp())
+        );
+
+        $images = array_map(
+            function ($item) {
+                $candid      = $item['CandID'];
+                $pscid       = $item['PSCID'];
+                $session     = $item['Visit_label'];
+                $visit_date  = $item['Date_visit'];
+                $site_name   = $item['SiteName'];
+                $file_name   = basename($item['File']);
+                $scan_type   = $item['Scan_type'];
+                $qc_status   = $item['QCStatus'];
+                $selected    = $item['Selected'];
+                $link        = "/candidates/$candid/$session/images/$file_name";
+                $insert_time = date('c', $item['InsertTime']);
+                return array(
+                        'Candidate'  => $candid,
+                        'PCSID'      => $pscid,
+                        'Visit'      => $session,
+                        'Visit_date' => $visit_date,
+                        'Site'       => $site_name,
+                        'ScanType'   => $scan_type,
+                        'QC_status'  => $qc_status,
+                        'Selected'   => $selected,
+                        'Link'       => $link,
+                        'InsertTime' => $insert_time,
+                       );
+            },
+            $result
+        );
+
+        $this->JSON = ["Images" => $images];
+    }
+}
+
+$input = null;
+switch ($_SERVER['REQUEST_METHOD']) {
+case 'GET':
+    $input = $_GET;
+    break;
+}
+print (new Images($_SERVER['REQUEST_METHOD'], $input))->toJSONString();
+
diff --git a/htdocs/api/v0.0.3-dev/projects/InstrumentForm.php b/htdocs/api/v0.0.3-dev/projects/InstrumentForm.php
new file mode 100644
index 00000000000..e16269aace2
--- /dev/null
+++ b/htdocs/api/v0.0.3-dev/projects/InstrumentForm.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * This returns the instrument passed in by the Instrument GET parameter
+ * and serializes it as JSON for the REST API.
+ *
+ * PHP Version 5
+ *
+ * @category Loris
+ * @package  API
+ * @author   Dave MacFarlane <driusan@bic.mni.mcgill.ca>
+ * @license  Loris license
+ * @link     https://github.com/aces/Loris
+ */
+namespace Loris\API\Projects;
+//Load config file and ensure paths are correct
+set_include_path(get_include_path() . ":" . __DIR__ . "/../");
+require_once 'APIBase.php';
+
+/**
+ * Class which handles serialization of instrument forms in Loris API
+ *
+ * @category Loris
+ * @package  API
+ * @author   Dave MacFarlane <driusan@bic.mni.mcgill.ca>
+ * @license  Loris license
+ * @link     https://github.com/aces/Loris
+ */
+class InstrumentForm extends \Loris\API\APIBase
+{
+    var $Instrument;
+
+    /**
+     * Construct the object to handle requests. This will instantiate
+     * the NDB_BVL_Instrument object and call toJSON to return the
+     * JSON to the client.
+     *
+     * @param string $method     The HTTP method used for the request
+     * @param string $Instrument The instrument to be serialized
+     */
+    function __construct($method, $Instrument)
+    {
+        $this->AutoHandleRequestDelegation = false;
+        parent::__construct($method);
+
+        try {
+            $this->Instrument = \NDB_BVL_Instrument::factory(
+                $Instrument,
+                null,
+                null,
+                true
+            );
+        } catch(\Exception $e) {
+            $this->header("HTTP/1.1 404 Not Found");
+            $this->error("Invalid Instrument");
+            $this->safeExit(0);
+        }
+
+        // JSON is used by both calculateETag and handleGET, so do it
+        // before either is called.
+        $this->JSONString = $this->Instrument->toJSON();
+        $this->handleRequest();
+    }
+
+
+    /**
+     * Handles a GET request to this URL
+     *
+     * @return void but populates JSON class variable
+     */
+    function handleGET()
+    {
+        $this->JSON = json_decode($this->JSONString, true);
+    }
+
+    /**
+     * Calculates the ETag for this instrument by just taking
+     * an MD5 of the JSON
+     *
+     * @return string ETag for this instrument
+     */
+    function calculateETag()
+    {
+        return md5('Instrument:' . $this->JSONString);
+    }
+
+}
+
+if (isset($_REQUEST['PrintInstrumentForm'])) {
+    $obj = new InstrumentForm($_SERVER['REQUEST_METHOD'], $_REQUEST['Instrument']);
+    print $obj->toJSONString();
+}
+?>
diff --git a/htdocs/api/v0.0.3-dev/projects/Project.php b/htdocs/api/v0.0.3-dev/projects/Project.php
new file mode 100644
index 00000000000..bed99513e0c
--- /dev/null
+++ b/htdocs/api/v0.0.3-dev/projects/Project.php
@@ -0,0 +1,173 @@
+<?php
+/**
+ * This class handles project related API requests. Depending on how it
+ * is called it can include either the candidates, visits, instruments,
+ * or all of the above that should be serialized.
+ *
+ * PHP Version 5
+ *
+ * @category Main
+ * @package  API
+ * @author   Dave MacFarlane <david.macfarlane2@mcgill.ca>
+ * @license  http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link     https://www.github.com/aces/Loris/
+ */
+namespace Loris\API\Projects;
+
+set_include_path(get_include_path() . ":" . __DIR__ . "/..");
+require_once 'APIBase.php';
+
+/**
+ * This class handles project related API requests. Depending on how it
+ * is called it can include either the candidates, visits, instruments,
+ * or all of the above that should be serialized.
+ *
+ * PHP Version 5
+ *
+ * @category Main
+ * @package  API
+ * @author   Dave MacFarlane <david.macfarlane2@mcgill.ca>
+ * @license  http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
+ * @link     https://www.github.com/aces/Loris/
+ */
+class Project extends \Loris\API\APIBase
+{
+    private $_project;
+
+    /**
+     * Constructs an object to handle JSON serialization
+     *
+     * @param string  $method             The HTTP method of the request
+     * @param string  $projectName        The project to be serialized
+     * @param boolean $bCandidates        If true, candidates for project
+     *                                    should be included in serialization
+     *                                    be included in serialization be
+     *                                    included in serialization
+     * @param boolean $bInstruments       If true, list of instruments for
+     *                                    project should be included in
+     *                                    serialization should be included
+     *                                    in serialization should be included
+     *                                    in serialization
+     * @param boolean $bVisits            If true, visits for project should be
+     *                                    included in serialization included in
+     *                                    serialization included in serialization
+     * @param boolean $bInstrumentDetails If true, InstrumentDetails are populated
+     *                                    instead of instrument names
+     */
+    public function __construct(
+        $method,
+        $projectName,
+        $bCandidates,
+        $bInstruments,
+        $bVisits,
+        $bInstrumentDetails = false
+    ) {
+        $this->AutoHandleRequestDelegation = false;
+        parent::__construct($method);
+
+        $this->bCandidates        = $bCandidates;
+        $this->bInstruments       = $bInstruments;
+        $this->bInstrumentDetails = $bInstrumentDetails;
+        $this->bVisits            = $bVisits;
+
+        try {
+            $this->project = $this->Factory->project($projectName);
+        } catch (\LorisException $e) {
+            // This projectName does not exists
+            $this->header("HTTP/1.1 404 Not Found");
+            $this->error(['error' => 'Invalid project']);
+            $this->safeExit(0);
+        }
+
+        $this->handleRequest();
+    }
+
+    /**
+     * Handles a GET request for a project data
+     *
+     * @return void but populates $this->JSON
+     */
+    function handleGET()
+    {
+        if (!empty($this->JSON)) {
+            return;
+        }
+        $JSONArray = [
+                      "Meta" => [
+                                 "Project" => $this->project->getName(),
+                                ],
+                     ];
+
+        if ($this->bCandidates) {
+            $JSONArray['Candidates'] = $this->project->getCandidateIds();
+        }
+
+        if ($this->bInstruments) {
+            $Instruments = \Utility::getAllInstruments();
+
+            if ($this->bInstrumentDetails) {
+                $dets   = [];
+                $config = $this->Factory->config();
+                $DB     = $this->Factory->database();
+
+                $DDE = $config->getSetting("DoubleDataEntryInstruments");
+
+                foreach ($Instruments as $instrument=> $FullName ) {
+                    $subgroup = $DB->pselectOne(
+                        "SELECT sg.Subgroup_name
+                            FROM test_names tn
+                            LEFT JOIN test_subgroups sg ON (tn.Sub_group=sg.ID)
+                        WHERE tn.Test_name=:inst",
+                        array('inst' => $instrument)
+                    );
+
+                    $DDEEn = in_array($instrument, $DDE);
+
+                    $dets[$instrument] = [
+                                          'FullName'               => $FullName,
+                                          'Subgroup'               => $subgroup,
+                                          'DoubleDataEntryEnabled' => $DDEEn,
+                                         ];
+                }
+                $JSONArray['Instruments'] = $dets;
+            } else {
+                $JSONArray['Instruments'] = array_keys($Instruments);
+            }
+        }
+
+        if ($this->bVisits) {
+            $Visits     = \Utility::getExistingVisitLabels($this->project->getId());
+            $VisitNames = array_keys($Visits);
+
+            $JSONArray['Visits'] = $VisitNames;
+        }
+
+        $this->JSON = $JSONArray;
+    }
+
+    /**
+     * Calculates the ETag for this project by taking an MD5 of the
+     * JSON
+     *
+     * @return string ETag for project
+     */
+    function calculateETag()
+    {
+        return md5('Project:' . json_encode($this->JSON, true));
+    }
+
+}
+
+if (isset($_REQUEST['PrintProjectJSON'])) {
+    $Proj = new Project(
+        $_SERVER['REQUEST_METHOD'],
+        $_REQUEST['Project'],
+        isset($_REQUEST['Candidates'])  ? true : false,
+        isset($_REQUEST['Instruments']) ? true : false,
+        isset($_REQUEST['Visits'])      ? true : false,
+        isset($_REQUEST['InstrumentDetails'])      ? true : false
+    );
+
+    print $Proj->toJSONString();
+}
+?>
diff --git a/htdocs/bootstrap/css/custom-css.css b/htdocs/bootstrap/css/custom-css.css
index 92c4c2aba07..fb4452f5d18 100644
--- a/htdocs/bootstrap/css/custom-css.css
+++ b/htdocs/bootstrap/css/custom-css.css
@@ -306,6 +306,13 @@ display: block;
 .btn-breadcrumb .btn:last-child {
   padding:6px 18px 6px 24px;
 }
+.btn-inline {
+    margin-right: 3px;
+    margin-bottom: 3px;
+}
+.btn-add-tag {
+    margin-top: 3px;
+}
 
 /** Primary button **/
 .btn-breadcrumb .btn.btn-primary:not(:last-child):after {
diff --git a/htdocs/installdb.php b/htdocs/installdb.php
index dd5c12ad3c2..df40987ecfc 100644
--- a/htdocs/installdb.php
+++ b/htdocs/installdb.php
@@ -51,12 +51,13 @@
 // smarty to use when it gets autoloaded.
 require_once __DIR__ . "/../php/installer/Database.class.inc";
 require_once __DIR__ . "/../php/installer/NDB_Config.class.inc";
+use \LORIS\Installer\Database as Database;
 
 $installer = new Installer("../project");
 
 // Check the dependencies of this script.
-if ($installer->CheckPreconditionsValid() === false) {
-    $err = $installer->GetLastError();
+if ($installer->checkPreconditionsValid() === false) {
+    $err = $installer->getLastError();
     if ($err == "") {
         $err = "Unknown error checking LORIS install preconditions. Sorry.";
     }
@@ -65,8 +66,8 @@
 }
 
 // Check the dependencies of LORIS
-if ($installer->CheckSystemDependenciesValid() == false) {
-    $err = $installer->GetLastError();
+if ($installer->checkSystemDependenciesValid() == false) {
+    $err = $installer->getLastError();
     if ($err == "") {
         $err = "Unknown error checking system dependencies.";
     }
@@ -74,7 +75,7 @@
     exit(3);
 }
 
-require_once __DIR__ . "/../vendor/autoload.php";
+require_once __DIR__ . '/../vendor/autoload.php';
 
 ini_set('default_charset', 'utf-8');
 // Create an output buffer to capture console output, separately from the
@@ -95,49 +96,79 @@
     // This will connect to MySQL, check the permissions of the
     // account provided, check that the database doesn't already
     // exist, and create the database.
-    if ($installer->CreateMySQLDB($_POST) === false) {
-        $tpl_data['error'] = $installer->GetLastError();
-        $tpl_data['Page']  = "";
-        break;
+    if (!isset($_POST['use_existing_tables'])) {
+        if (!isset($_POST['use_existing_database'])) {
+            if ($installer->createMySQLDB($_POST) === false) {
+                $tpl_data['error'] = $installer->getLastError();
+                $tpl_data['Page']  = "";
+                break;
+            }
+        }
+        if ($installer->sourceSchema($_POST) === false) {
+            $tpl_data['error'] = $installer->getLastError();
+            $tpl_data['Page']  = "";
+            break;
+        }
     }
-    if ($installer->SourceSchema($_POST) === false) {
-        $tpl_data['error'] = $installer->GetLastError();
-        $tpl_data['Page']  = "";
-        break;
+    if (!isset($_POST['use_existing_configs'])) {
+        if ($installer->updateBaseConfig($_POST) === false) {
+            $tpl_data['error'] = $installer->getLastError();
+            $tpl_data['Page']  = "";
+            break;
+        }
     }
-    if ($installer->UpdateBaseConfig($_POST) === false) {
-        $tpl_data['error'] = $installer->GetLastError();
-        $tpl_data['Page']  = "";
+    if (!Database::canLogIn(
+        $_POST['dbhost'],
+        $_POST['dbname'],
+        $_POST['dbadminuser'],
+        $_POST['dbadminpassword']
+    )) {
+        $tpl_data['error'] = 'The specified user does not exist or '.
+            'is using an incorrect password or the database does not exist';
+        $tpl_data['Page']  = '';
         break;
     }
-
-    $tpl_data['Page'] = "MySQLUserPrompt";
+    $tpl_data['Page'] = 'MySQLUserPrompt';
     break;
 case 'createmysqlaccount':
-    if ($installer->CreateMySQLAccount($_POST) === false) {
-        $tpl_data['error'] = $installer->GetLastError();
-        $tpl_data['Page']  = "MySQLUserPrompt";
-        break;
+    if (isset($_POST["lorismysql_already_created"])) {
+        //Verify that it is, indeed, the case.
+        if (!Database::canLogIn(
+            $_POST["dbhost"],
+            $_POST["dbname"],
+            $_POST["lorismysqluser"],
+            $_POST["lorismysqlpassword"]
+        )) {
+            $tpl_data["error"] = "The specified user does not exist or ".
+                "is using an incorrect password or the database does not exist";
+            $tpl_data["Page"]  = "MySQLUserPrompt";
+            break;
+        }
+    } else {
+        if ($installer->createMySQLAccount($_POST) === false) {
+            $tpl_data['error'] = $installer->getLastError();
+            $tpl_data['Page']  = "MySQLUserPrompt";
+            break;
+        }
     }
-
-    if ($installer->ResetFrontEndAdmin($_POST) === false) {
-        $tpl_data['error'] = $installer->GetLastError();
+    if ($installer->resetFrontEndAdmin($_POST) === false) {
+        $tpl_data['error'] = $installer->getLastError();
         $tpl_data['Page']  = "MySQLUserPrompt";
         break;
     }
 
-    if ($installer->ConfigWritable()) {
-        if ($installer->WriteConfig($_POST) === false) {
-            $tpl_data['error'] = $installer->GetLastError();
+    if ($installer->configWritable()) {
+        if ($installer->writeConfig($_POST) === false) {
+            $tpl_data['error'] = $installer->getLastError();
             $tpl_data['Page']  = "MySQLUserPrompt";
             break;
         }
-        $tpl_data['configfile'] = $installer->GetBaseDir() . "/project/config.xml";
+        $tpl_data['configfile'] = $installer->getBaseDir() . "project/config.xml";
     } else {
-        $tpl_data['configlocation'] = $installer->GetBaseDir()
-                 . "/project/config.xml";
+        $tpl_data['configlocation'] = $installer->getBaseDir()
+                 . "project/config.xml";
         $tpl_data['configcontent']  = htmlspecialchars(
-            $installer->GetConfigContent($_POST)
+            $installer->getConfigContent($_POST)
         );
     }
     $tpl_data['Page'] = "Done";
@@ -147,11 +178,13 @@
 
 // Set up some special smarty variables that are required on different
 // pages
-if ($tpl_data['Page'] == 'MySQLUserPrompt') {
-    $tpl_data['SamplePassword']  = User::newPassword(16);
-    $tpl_data['SamplePassword2'] = User::newPassword(16);
-} else if ($tpl_data['Page'] == "Done") {
-    $tpl_data['lorisurl'] = $installer->getBaseURL();
+if (isset($tpl_data['Page'])) {
+    if ($tpl_data['Page'] == 'MySQLUserPrompt') {
+        $tpl_data['SamplePassword']  = User::newPassword(16);
+        $tpl_data['SamplePassword2'] = User::newPassword(16);
+    } else if ($tpl_data['Page'] == 'Done') {
+        $tpl_data['lorisurl'] = $installer->getBaseURL();
+    }
 }
 // end ob_start that captures console output. The Smarty hook
 // needs to be able to write to the client.
@@ -174,14 +207,18 @@ function tplvar($name)
         $tpl_data[$name] = '';
     }
 }
-tplvar("dbhost");
-tplvar("dbadminuser");
-tplvar("dbadminpassword");
-tplvar("dbname");
-tplvar("lorismysqluser");
-tplvar("lorismysqlpassword");
-tplvar("frontenduser");
-tplvar("frontendpassword");
+tplvar('dbhost');
+tplvar('dbadminuser');
+tplvar('dbadminpassword');
+tplvar('dbname');
+tplvar('lorismysqluser');
+tplvar('lorismysqlpassword');
+tplvar('frontenduser');
+tplvar('frontendpassword');
+tplvar('use_existing_database');
+tplvar('use_existing_tables');
+tplvar('use_existing_configs');
+tplvar('lorismysql_already_created');
 $smarty = new Smarty_NeuroDB;
 $smarty->assign($tpl_data);
 $smarty->display('install.tpl');
diff --git a/htdocs/js/components/Form.js b/htdocs/js/components/Form.js
index 70d44cec088..36f1e69bd1c 100644
--- a/htdocs/js/components/Form.js
+++ b/htdocs/js/components/Form.js
@@ -1,2 +1,2 @@
-!function(modules){function __webpack_require__(moduleId){if(installedModules[moduleId])return installedModules[moduleId].exports;var module=installedModules[moduleId]={exports:{},id:moduleId,loaded:!1};return modules[moduleId].call(module.exports,module,module.exports,__webpack_require__),module.loaded=!0,module.exports}var installedModules={};return __webpack_require__.m=modules,__webpack_require__.c=installedModules,__webpack_require__.p="",__webpack_require__(0)}([function(module,exports){"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var FormElement=React.createClass({displayName:"FormElement",propTypes:{name:React.PropTypes.string.isRequired,id:React.PropTypes.string,method:React.PropTypes.oneOf(["POST","GET"]),action:React.PropTypes.string,class:React.PropTypes.string,columns:React.PropTypes.number,formElements:React.PropTypes.shape({elementName:React.PropTypes.shape({name:React.PropTypes.string,type:React.PropTypes.string})}),onSubmit:React.PropTypes.func,onUserInput:React.PropTypes.func},getDefaultProps:function(){return{name:null,id:null,method:"POST",action:void 0,class:"form-horizontal",columns:1,fileUpload:!1,formElements:{},onSubmit:function(){console.warn("onSubmit() callback is not set!")}}},getFormElements:function(){var formElementsHTML=[],columns=this.props.columns,maxColumnSize=12,colSize=Math.floor(maxColumnSize/columns),colClass="col-xs-12 col-sm-"+colSize+" col-md-"+colSize,filter=this.props.formElements;return Object.keys(filter).forEach(function(objKey,index){var userInput=this.props.onUserInput?this.props.onUserInput:filter[objKey].onUserInput,value=filter[objKey].value?filter[objKey].value:"";formElementsHTML.push(React.createElement("div",{key:"el_"+index,className:colClass},React.createElement(LorisElement,{element:filter[objKey],onUserInput:userInput,value:value})))}.bind(this)),React.Children.forEach(this.props.children,function(child,key){var elementClass="col-xs-12 col-sm-12 col-md-12";React.isValidElement(child)&&"function"==typeof child.type&&(elementClass=colClass),formElementsHTML.push(React.createElement("div",{key:"el_child_"+key,className:elementClass},child))}),formElementsHTML},handleSubmit:function(e){this.props.onSubmit&&(e.preventDefault(),this.props.onSubmit(e))},render:function(){var encType=this.props.fileUpload?"multipart/form-data":null,formElements=this.getFormElements(),rowStyles={display:"flex",flexWrap:"wrap"};return React.createElement("form",{name:this.props.name,id:this.props.id,className:this.props.class,method:this.props.method,action:this.props.action,encType:encType,onSubmit:this.handleSubmit},React.createElement("div",{className:"row",style:rowStyles},formElements))}}),SelectElement=React.createClass({displayName:"SelectElement",propTypes:{name:React.PropTypes.string.isRequired,options:React.PropTypes.object.isRequired,label:React.PropTypes.string,value:React.PropTypes.oneOfType([React.PropTypes.string,React.PropTypes.array]),id:React.PropTypes.string,class:React.PropTypes.string,multiple:React.PropTypes.bool,disabled:React.PropTypes.bool,required:React.PropTypes.bool,emptyOption:React.PropTypes.bool,hasError:React.PropTypes.bool,errorMessage:React.PropTypes.string,onUserInput:React.PropTypes.func},getDefaultProps:function(){return{name:"",options:{},label:"",value:void 0,id:"",class:"",multiple:!1,disabled:!1,required:!1,emptyOption:!0,hasError:!1,errorMessage:"The field is required!",onUserInput:function(){console.warn("onUserInput() callback is not set")}}},handleChange:function(e){var value=e.target.value,options=e.target.options;if(this.props.multiple&&options.length>1){value=[];for(var i=0,l=options.length;i<l;i++)options[i].selected&&value.push(options[i].value)}this.props.onUserInput(this.props.name,value)},render:function(){var multiple=this.props.multiple?"multiple":null,required=this.props.required?"required":null,disabled=this.props.disabled?"disabled":null,options=this.props.options,errorMessage=null,emptyOptionHTML=null,requiredHTML=null,elementClass="row form-group";required&&(requiredHTML=React.createElement("span",{className:"text-danger"},"*")),this.props.emptyOption&&(emptyOptionHTML=React.createElement("option",null)),(this.props.hasError||this.props.required&&""===this.props.value)&&(errorMessage=React.createElement("span",null,this.props.errorMessage),elementClass="row form-group has-error");var value=this.props.value||(multiple?[]:"");return React.createElement("div",{className:elementClass},React.createElement("label",{className:"col-sm-3 control-label",htmlFor:this.props.label},this.props.label,requiredHTML),React.createElement("div",{className:"col-sm-9"},React.createElement("select",{name:this.props.name,multiple:multiple,className:"form-control",id:this.props.label,value:value,onChange:this.handleChange,required:required,disabled:disabled},emptyOptionHTML,Object.keys(options).map(function(option){return React.createElement("option",{value:option,key:option},options[option])})),errorMessage))}}),TextareaElement=React.createClass({displayName:"TextareaElement",propTypes:{name:React.PropTypes.string.isRequired,label:React.PropTypes.string,value:React.PropTypes.string,id:React.PropTypes.string,disabled:React.PropTypes.bool,required:React.PropTypes.bool,rows:React.PropTypes.number,cols:React.PropTypes.number,onUserInput:React.PropTypes.func},getDefaultProps:function(){return{name:"",label:"",value:"",id:null,disabled:!1,required:!1,rows:4,cols:25,onUserInput:function(){console.warn("onUserInput() callback is not set")}}},handleChange:function(e){this.props.onUserInput(this.props.name,e.target.value)},render:function(){var disabled=this.props.disabled?"disabled":null,required=this.props.required?"required":null,requiredHTML=null;return required&&(requiredHTML=React.createElement("span",{className:"text-danger"},"*")),React.createElement("div",{className:"row form-group"},React.createElement("label",{className:"col-sm-3 control-label",htmlFor:this.props.id},this.props.label,requiredHTML),React.createElement("div",{className:"col-sm-9"},React.createElement("textarea",{cols:this.props.cols,rows:this.props.rows,className:"form-control",name:this.props.name,id:this.props.id,value:this.props.value||"",required:required,disabled:disabled,onChange:this.handleChange})))}}),TextboxElement=React.createClass({displayName:"TextboxElement",propTypes:{name:React.PropTypes.string.isRequired,label:React.PropTypes.string,value:React.PropTypes.string,id:React.PropTypes.string,disabled:React.PropTypes.bool,required:React.PropTypes.bool,onUserInput:React.PropTypes.func},getDefaultProps:function(){return{name:"",label:"",value:"",id:null,disabled:!1,required:!1,onUserInput:function(){console.warn("onUserInput() callback is not set")}}},handleChange:function(e){this.props.onUserInput(this.props.name,e.target.value)},render:function(){var disabled=this.props.disabled?"disabled":null,required=this.props.required?"required":null,requiredHTML=null;return required&&(requiredHTML=React.createElement("span",{className:"text-danger"},"*")),React.createElement("div",{className:"row form-group"},React.createElement("label",{className:"col-sm-3 control-label",htmlFor:this.props.id},this.props.label,requiredHTML),React.createElement("div",{className:"col-sm-9"},React.createElement("input",{type:"text",className:"form-control",name:this.props.name,id:this.props.id,value:this.props.value||"",required:required,disabled:disabled,onChange:this.handleChange})))}}),DateElement=React.createClass({displayName:"DateElement",propTypes:{name:React.PropTypes.string.isRequired,label:React.PropTypes.string,value:React.PropTypes.string,id:React.PropTypes.string,disabled:React.PropTypes.bool,required:React.PropTypes.bool,onUserInput:React.PropTypes.func},getDefaultProps:function(){return{name:"",label:"",value:"",id:null,disabled:!1,required:!1,onUserInput:function(){console.warn("onUserInput() callback is not set")}}},handleChange:function(e){this.props.onUserInput(this.props.name,e.target.value)},render:function(){var disabled=this.props.disabled?"disabled":null,required=this.props.required?"required":null,requiredHTML=null;return required&&(requiredHTML=React.createElement("span",{className:"text-danger"},"*")),React.createElement("div",{className:"row form-group"},React.createElement("label",{className:"col-sm-3 control-label",htmlFor:this.props.label},this.props.label,requiredHTML),React.createElement("div",{className:"col-sm-9"},React.createElement("input",{type:"date",className:"form-control",name:this.props.name,id:this.props.label,min:this.props.minYear,max:this.props.maxYear,onChange:this.handleChange,value:this.props.value||"",required:required,disabled:disabled})))}}),NumericElement=React.createClass({displayName:"NumericElement",propTypes:{name:React.PropTypes.string.isRequired,min:React.PropTypes.number.isRequired,max:React.PropTypes.number.isRequired,label:React.PropTypes.string,value:React.PropTypes.string,id:React.PropTypes.string,disabled:React.PropTypes.bool,required:React.PropTypes.bool,onUserInput:React.PropTypes.func},getDefaultProps:function(){return{name:"",min:null,max:null,label:"",value:"",id:null,required:!1,disabled:!1,onUserInput:function(){console.warn("onUserInput() callback is not set")}}},handleChange:function(e){this.props.onUserInput(this.props.name,e.target.value)},render:function(){var disabled=this.props.disabled?"disabled":null,required=this.props.required?"required":null,requiredHTML=null;return React.createElement("div",{className:"row form-group"},React.createElement("label",{className:"col-sm-3 control-label",htmlFor:this.props.id},this.props.label,requiredHTML),React.createElement("div",{className:"col-sm-9"},React.createElement("input",{type:"number",className:"form-control",name:this.props.name,id:this.props.id,min:this.props.min,max:this.props.max,value:this.props.value,disabled:disabled,required:required,onChange:this.handleChange})))}}),FileElement=React.createClass({displayName:"FileElement",propTypes:{name:React.PropTypes.string.isRequired,label:React.PropTypes.string,value:React.PropTypes.oneOfType([React.PropTypes.string,React.PropTypes.object]),id:React.PropTypes.string,disabled:React.PropTypes.bool,required:React.PropTypes.bool,hasError:React.PropTypes.bool,errorMessage:React.PropTypes.string,onUserInput:React.PropTypes.func},getDefaultProps:function(){return{name:"",label:"File to Upload",value:"",id:null,disabled:!1,required:!1,hasError:!1,errorMessage:"The field is required!",onUserInput:function(){console.warn("onUserInput() callback is not set")}}},handleChange:function(e){var file=e.target.files[0]?e.target.files[0]:"";this.props.onUserInput(this.props.name,file)},render:function(){var required=this.props.required?"required":null,fileName=this.props.value?this.props.value.name:void 0,requiredHTML=null,errorMessage="",elementClass="row form-group";required&&(requiredHTML=React.createElement("span",{className:"text-danger"},"*"));var truncateEllipsis={display:"table",tableLayout:"fixed",width:"100%",whiteSpace:"nowrap"},truncateEllipsisChild={display:"table-cell",overflow:"hidden",textOverflow:"ellipsis"};this.props.hasError&&(errorMessage=this.props.errorMessage,elementClass="row form-group has-error");var fileHTML=document.querySelector(".fileUpload");return fileHTML&&!fileName&&(fileHTML.value=""),this.props.disabled?(truncateEllipsis.paddingTop="7px",React.createElement("div",{className:elementClass},React.createElement("label",{className:"col-sm-3 control-label"},this.props.label),React.createElement("div",{className:"col-sm-9"},React.createElement("div",{style:truncateEllipsis},React.createElement("span",{style:truncateEllipsisChild},fileName))))):React.createElement("div",{className:elementClass},React.createElement("label",{className:"col-sm-3 control-label"},this.props.label,requiredHTML),React.createElement("div",{className:"col-sm-9"},React.createElement("div",{className:"input-group"},React.createElement("div",{tabIndex:"-1",className:"form-control file-caption kv-fileinput-caption"},React.createElement("div",{style:truncateEllipsis},React.createElement("span",{style:truncateEllipsisChild},fileName)),React.createElement("div",{className:"file-caption-name",id:"video_file"})),React.createElement("div",{className:"input-group-btn"},React.createElement("div",{className:"btn btn-primary btn-file"},React.createElement("i",{className:"glyphicon glyphicon-folder-open"})," Browse",React.createElement("input",{type:"file",className:"fileUpload",name:this.props.name,onChange:this.handleChange,required:required})))),React.createElement("span",null,errorMessage)))}}),StaticElement=React.createClass({displayName:"StaticElement",mixins:[React.addons.PureRenderMixin],propTypes:{label:React.PropTypes.string,text:React.PropTypes.oneOfType([React.PropTypes.string,React.PropTypes.element])},getDefaultProps:function(){return{label:"",text:null}},render:function(){return React.createElement("div",{className:"row form-group"},React.createElement("label",{className:"col-sm-3 control-label"},this.props.label),React.createElement("div",{className:"col-sm-9"},React.createElement("p",{className:"form-control-static"},this.props.text)))}}),ButtonElement=React.createClass({displayName:"ButtonElement",propTypes:{label:React.PropTypes.string,type:React.PropTypes.string,onUserInput:React.PropTypes.func},getDefaultProps:function(){return{label:"Submit",type:"submit",buttonClass:"btn btn-primary",columnSize:"col-sm-9 col-sm-offset-3",onUserInput:function(){console.warn("onUserInput() callback is not set")}}},handleClick:function(e){this.props.onUserInput(e)},render:function(){return React.createElement("div",{className:"row form-group"},React.createElement("div",{className:this.props.columnSize},React.createElement("button",{type:this.props.type,className:this.props.buttonClass,onClick:this.handleClick},this.props.label)))}}),LorisElement=React.createClass({displayName:"LorisElement",render:function(){var elementProps=this.props.element;elementProps.ref=elementProps.name,elementProps.onUserInput=this.props.onUserInput;var elementHtml=React.createElement("div",null);switch(elementProps.type){case"text":elementHtml=React.createElement(TextboxElement,elementProps);break;case"select":elementHtml=React.createElement(SelectElement,elementProps);break;case"date":elementHtml=React.createElement(DateElement,elementProps);break;case"numeric":elementHtml=React.createElement(NumericElement,elementProps);break;case"textarea":elementHtml=React.createElement(TextareaElement,elementProps);break;case"file":elementHtml=React.createElement(FileElement,elementProps);break;case"static":elementHtml=React.createElement(StaticElement,elementProps);break;default:console.warn("Element of type "+elementProps.type+" is not currently implemented!")}return elementHtml}});window.FormElement=FormElement,window.SelectElement=SelectElement,window.TextareaElement=TextareaElement,window.TextboxElement=TextboxElement,window.DateElement=DateElement,window.NumericElement=NumericElement,window.FileElement=FileElement,window.StaticElement=StaticElement,window.ButtonElement=ButtonElement,window.LorisElement=LorisElement,exports.default={FormElement:FormElement,SelectElement:SelectElement,TextareaElement:TextareaElement,TextboxElement:TextboxElement,DateElement:DateElement,NumericElement:NumericElement,FileElement:FileElement,StaticElement:StaticElement,ButtonElement:ButtonElement,LorisElement:LorisElement}}]);
+!function(modules){function __webpack_require__(moduleId){if(installedModules[moduleId])return installedModules[moduleId].exports;var module=installedModules[moduleId]={exports:{},id:moduleId,loaded:!1};return modules[moduleId].call(module.exports,module,module.exports,__webpack_require__),module.loaded=!0,module.exports}var installedModules={};return __webpack_require__.m=modules,__webpack_require__.c=installedModules,__webpack_require__.p="",__webpack_require__(0)}([function(module,exports){"use strict";function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}Object.defineProperty(exports,"__esModule",{value:!0});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),FormElement=React.createClass({displayName:"FormElement",propTypes:{name:React.PropTypes.string.isRequired,id:React.PropTypes.string,method:React.PropTypes.oneOf(["POST","GET"]),action:React.PropTypes.string,class:React.PropTypes.string,columns:React.PropTypes.number,formElements:React.PropTypes.shape({elementName:React.PropTypes.shape({name:React.PropTypes.string,type:React.PropTypes.string})}),onSubmit:React.PropTypes.func,onUserInput:React.PropTypes.func},getDefaultProps:function(){return{name:null,id:null,method:"POST",action:void 0,class:"form-horizontal",columns:1,fileUpload:!1,formElements:{},onSubmit:function(){console.warn("onSubmit() callback is not set!")}}},getFormElements:function(){var formElementsHTML=[],columns=this.props.columns,maxColumnSize=12,colSize=Math.floor(maxColumnSize/columns),colClass="col-xs-12 col-sm-"+colSize+" col-md-"+colSize,filter=this.props.formElements;return Object.keys(filter).forEach(function(objKey,index){var userInput=this.props.onUserInput?this.props.onUserInput:filter[objKey].onUserInput,value=filter[objKey].value?filter[objKey].value:"";formElementsHTML.push(React.createElement("div",{key:"el_"+index,className:colClass},React.createElement(LorisElement,{element:filter[objKey],onUserInput:userInput,value:value})))}.bind(this)),React.Children.forEach(this.props.children,function(child,key){var elementClass="col-xs-12 col-sm-12 col-md-12";React.isValidElement(child)&&"function"==typeof child.type&&(elementClass=colClass),formElementsHTML.push(React.createElement("div",{key:"el_child_"+key,className:elementClass},child))}),formElementsHTML},handleSubmit:function(e){this.props.onSubmit&&(e.preventDefault(),this.props.onSubmit(e))},render:function(){var encType=this.props.fileUpload?"multipart/form-data":null,formElements=this.getFormElements(),rowStyles={display:"flex",flexWrap:"wrap"};return React.createElement("form",{name:this.props.name,id:this.props.id,className:this.props.class,method:this.props.method,action:this.props.action,encType:encType,onSubmit:this.handleSubmit},React.createElement("div",{className:"row",style:rowStyles},formElements))}}),SearchableDropdown=function(_React$Component){function SearchableDropdown(){_classCallCheck(this,SearchableDropdown);var _this=_possibleConstructorReturn(this,(SearchableDropdown.__proto__||Object.getPrototypeOf(SearchableDropdown)).call(this));return _this.getKeyFromValue=_this.getKeyFromValue.bind(_this),_this.handleChange=_this.handleChange.bind(_this),_this.handleBlur=_this.handleBlur.bind(_this),_this.getTextInputValue=_this.getTextInputValue.bind(_this),_this}return _inherits(SearchableDropdown,_React$Component),_createClass(SearchableDropdown,[{key:"getKeyFromValue",value:function(value){var options=this.props.options;return Object.keys(options).find(function(o){return options[o]===value})}},{key:"handleChange",value:function(e){var value=this.getKeyFromValue(e.target.value);this.props.strictSearch||void 0!==value||(value=e.target.value),this.props.onUserInput(this.props.name,value)}},{key:"handleBlur",value:function(e){if(this.props.strictSearch){var value=e.target.value,options=this.props.options;Object.values(options).indexOf(value)===-1&&(document.querySelector('input[name="'+(this.props.name+"_input")+'"]').value="",this.props.onUserInput(this.props.name,""))}}},{key:"getTextInputValue",value:function(){return document.querySelector('input[name="'+(this.props.name+"_input")+'"]').value}},{key:"render",value:function(){var required=this.props.required?"required":null,disabled=this.props.disabled?"disabled":null,options=this.props.options,strictMessage="Entry must be included in provided list of options.",errorMessage=null,requiredHTML=null,elementClass="row form-group";if(required&&(requiredHTML=React.createElement("span",{className:"text-danger"},"*")),this.props.errorMessage)errorMessage=React.createElement("span",null,this.props.errorMessage),elementClass="row form-group has-error";else if(this.props.required&&""===this.props.value){var msg="This field is required!";msg+=this.props.strictSearch?" "+strictMessage:"",errorMessage=React.createElement("span",null,msg),elementClass="row form-group has-error"}else this.props.strictSearch&&""===this.props.value&&(errorMessage=React.createElement("span",null,strictMessage),elementClass="row form-group has-error");var value=void 0;return void 0!==this.props.value&&(value=Object.keys(options).indexOf(this.props.value)>-1?options[this.props.value]:this.getTextInputValue()),React.createElement("div",{className:elementClass},React.createElement("label",{className:"col-sm-3 control-label",htmlFor:this.props.label},this.props.label,requiredHTML),React.createElement("div",{className:"col-sm-9"},React.createElement("input",{type:"text",name:this.props.name+"_input",value:value,id:this.props.id,list:this.props.name+"_list",className:"form-control",disabled:disabled,placeholder:this.props.placeHolder,onChange:this.handleChange,onBlur:this.handleBlur}),React.createElement("datalist",{id:this.props.name+"_list"},Object.keys(options).map(function(option){return React.createElement("option",{value:options[option],key:option})})),errorMessage))}}]),SearchableDropdown}(React.Component);SearchableDropdown.propTypes={name:React.PropTypes.string.isRequired,options:React.PropTypes.object.isRequired,id:React.PropTypes.string,strictSearch:React.PropTypes.bool,label:React.PropTypes.string,value:React.PropTypes.oneOfType([React.PropTypes.string,React.PropTypes.array]),class:React.PropTypes.string,disabled:React.PropTypes.bool,required:React.PropTypes.bool,errorMessage:React.PropTypes.string,placeHolder:React.PropTypes.string,onUserInput:React.PropTypes.func},SearchableDropdown.defaultProps={name:"",options:{},strictSearch:!0,label:"",value:void 0,id:"",class:"",disabled:!1,required:!1,errorMessage:"",placeHolder:"",onUserInput:function(){console.warn("onUserInput() callback is not set")}};var SelectElement=React.createClass({displayName:"SelectElement",propTypes:{name:React.PropTypes.string.isRequired,options:React.PropTypes.object.isRequired,label:React.PropTypes.string,value:React.PropTypes.oneOfType([React.PropTypes.string,React.PropTypes.array]),id:React.PropTypes.string,class:React.PropTypes.string,multiple:React.PropTypes.bool,disabled:React.PropTypes.bool,required:React.PropTypes.bool,emptyOption:React.PropTypes.bool,hasError:React.PropTypes.bool,errorMessage:React.PropTypes.string,onUserInput:React.PropTypes.func},getDefaultProps:function(){return{name:"",options:{},label:"",value:void 0,id:"",class:"",multiple:!1,disabled:!1,required:!1,emptyOption:!0,hasError:!1,errorMessage:"The field is required!",onUserInput:function(){console.warn("onUserInput() callback is not set")}}},handleChange:function(e){var value=e.target.value,options=e.target.options;if(this.props.multiple&&options.length>1){value=[];for(var i=0,l=options.length;i<l;i++)options[i].selected&&value.push(options[i].value)}this.props.onUserInput(this.props.name,value)},render:function(){var multiple=this.props.multiple?"multiple":null,required=this.props.required?"required":null,disabled=this.props.disabled?"disabled":null,options=this.props.options,errorMessage=null,emptyOptionHTML=null,requiredHTML=null,elementClass="row form-group";required&&(requiredHTML=React.createElement("span",{className:"text-danger"},"*")),this.props.emptyOption&&(emptyOptionHTML=React.createElement("option",null)),(this.props.hasError||this.props.required&&""===this.props.value)&&(errorMessage=React.createElement("span",null,this.props.errorMessage),elementClass="row form-group has-error");var value=this.props.value||(multiple?[]:"");return React.createElement("div",{className:elementClass},React.createElement("label",{className:"col-sm-3 control-label",htmlFor:this.props.label},this.props.label,requiredHTML),React.createElement("div",{className:"col-sm-9"},React.createElement("select",{name:this.props.name,multiple:multiple,className:"form-control",id:this.props.id,value:value,onChange:this.handleChange,required:required,disabled:disabled},emptyOptionHTML,Object.keys(options).map(function(option){return React.createElement("option",{value:option,key:option},options[option])})),errorMessage))}}),TagsElement=function(_React$Component2){function TagsElement(){_classCallCheck(this,TagsElement);var _this2=_possibleConstructorReturn(this,(TagsElement.__proto__||Object.getPrototypeOf(TagsElement)).call(this));return _this2.handleChange=_this2.handleChange.bind(_this2),_this2.handleKeyPress=_this2.handleKeyPress.bind(_this2),_this2.handleAdd=_this2.handleAdd.bind(_this2),_this2.handleRemove=_this2.handleRemove.bind(_this2),_this2.getKeyFromValue=_this2.getKeyFromValue.bind(_this2),_this2.canAddItem=_this2.canAddItem.bind(_this2),_this2}return _inherits(TagsElement,_React$Component2),_createClass(TagsElement,[{key:"handleChange",value:function(e){this.props.onUserInput(this.props.pendingValKey,e.target.value)}},{key:"handleKeyPress",value:function(e){13!==e.keyCode&&13!==e.which||(e.preventDefault(),this.handleAdd())}},{key:"handleAdd",value:function(){var options=this.props.options,value=this.props.value;this.props.useSearch&&Object.values(options).indexOf(value)>-1&&(value=this.getKeyFromValue(value)),this.canAddItem(value)&&this.props.onUserAdd(this.props.name,value,this.props.pendingValKey)}},{key:"handleRemove",value:function(e){var value=e.target.getAttribute("data-item");this.props.onUserRemove(this.props.name,value)}},{key:"getKeyFromValue",value:function(value){var options=this.props.options;return Object.keys(options).find(function(o){return options[o]===value})}},{key:"canAddItem",value:function(value){var result=!0;return value?!this.props.allowDupl&&this.props.items.indexOf(value)>-1?result=!1:this.props.useSearch&&this.props.strictSearch&&Object.keys(this.props.options).indexOf(value)===-1&&(result=!1):result=!1,result}},{key:"render",value:function(){var disabled=this.props.disabled?"disabled":null,requiredHTML=null,emptyOptionHTML=null,errorMessage=null,elementClass="row form-group";this.props.required&&(requiredHTML=React.createElement("span",{className:"text-danger"},"*")),this.props.emptyOption&&(emptyOptionHTML=React.createElement("option",null)),this.props.errorMessage&&(errorMessage=React.createElement("span",null,this.props.errorMessage),elementClass="row form-group has-error");var input=void 0,options=this.props.options;input=Object.keys(options).length>0&&this.props.useSearch?React.createElement("div",null,React.createElement("input",{type:"text",name:this.props.name,id:this.props.id,list:this.props.id+"_list",className:"form-control",value:this.props.value||"",disabled:disabled,onChange:this.handleChange,onKeyPress:this.handleKeyPress}),React.createElement("datalist",{id:this.props.id+"_list"},Object.keys(options).map(function(option){return React.createElement("option",{value:options[option],key:option},options[option])}))):Object.keys(options).length>0?React.createElement("select",{name:this.props.name,className:"form-control",id:this.props.id,value:this.props.value,disabled:disabled,onChange:this.handleChange,onKeyPress:this.handleKeyPress},emptyOptionHTML,Object.keys(options).map(function(option){return React.createElement("option",{value:option,key:option},options[option])})):React.createElement("input",{type:"text",name:this.props.name,id:this.props.id,className:"form-control",value:this.props.value||"",disabled:disabled,onChange:this.handleChange,onKeyPress:this.handleKeyPress});var items=this.props.items.map(function(item){var itmTxt=void 0;return itmTxt=Object.keys(options).length>0&&void 0!==options[item]?options[item]:item,React.createElement("button",{className:"btn btn-info btn-inline",type:"button",onClick:this.handleRemove,"data-item":item},itmTxt," ",React.createElement("span",{className:"glyphicon glyphicon-remove","data-item":item}))},this);return React.createElement("div",{className:elementClass},React.createElement("label",{className:"col-sm-3 control-label",htmlFor:this.props.id},this.props.label,requiredHTML),React.createElement("div",{className:"col-sm-9"},items,input,errorMessage,React.createElement("button",{className:"btn btn-success btn-add-tag",id:this.props.id+"Add",type:"button",onClick:this.handleAdd},React.createElement("span",{className:"glyphicon glyphicon-plus"}),this.props.btnLabel)))}}]),TagsElement}(React.Component);TagsElement.propTypes={name:React.PropTypes.string.isRequired,id:React.PropTypes.string.isRequired,pendingValKey:React.PropTypes.string.isRequired,options:React.PropTypes.object,items:React.PropTypes.array,label:React.PropTypes.string,value:React.PropTypes.string,class:React.PropTypes.string,multiple:React.PropTypes.bool,required:React.PropTypes.bool,disabled:React.PropTypes.bool,emptyOption:React.PropTypes.bool,errorMessage:React.PropTypes.string,btnLabel:React.PropTypes.string,allowDupl:React.PropTypes.bool,useSearch:React.PropTypes.bool,strictSearch:React.PropTypes.bool,onUserInput:React.PropTypes.func,onUserAdd:React.PropTypes.func,onUserRemove:React.PropTypes.func},TagsElement.defaultProps={name:"",options:{},items:[],label:"",value:void 0,id:"",class:"",required:!1,disabled:!1,emptyOption:!0,hasError:!1,allowDupl:!1,useSearch:!1,strictSearch:!1,errorMessage:"",pendingValKey:"",btnLabel:"Add Tag",onUserInput:function(){console.warn("onUserInput() callback is not set")},onUserAdd:function(){console.warn("onUserAdd() callback is not set")},onUserRemove:function(){console.warn("onUserRemove() callback is not set")}};var TextareaElement=React.createClass({displayName:"TextareaElement",propTypes:{name:React.PropTypes.string.isRequired,label:React.PropTypes.string,value:React.PropTypes.string,id:React.PropTypes.string,disabled:React.PropTypes.bool,required:React.PropTypes.bool,rows:React.PropTypes.number,cols:React.PropTypes.number,onUserInput:React.PropTypes.func},getDefaultProps:function(){return{name:"",label:"",value:"",id:null,disabled:!1,required:!1,rows:4,cols:25,onUserInput:function(){console.warn("onUserInput() callback is not set")}}},handleChange:function(e){this.props.onUserInput(this.props.name,e.target.value)},render:function(){var disabled=this.props.disabled?"disabled":null,required=this.props.required?"required":null,requiredHTML=null;return required&&(requiredHTML=React.createElement("span",{className:"text-danger"},"*")),React.createElement("div",{className:"row form-group"},React.createElement("label",{className:"col-sm-3 control-label",htmlFor:this.props.id},this.props.label,requiredHTML),React.createElement("div",{className:"col-sm-9"},React.createElement("textarea",{cols:this.props.cols,rows:this.props.rows,className:"form-control",name:this.props.name,id:this.props.id,value:this.props.value||"",required:required,disabled:disabled,onChange:this.handleChange})))}}),TextboxElement=React.createClass({displayName:"TextboxElement",propTypes:{name:React.PropTypes.string.isRequired,label:React.PropTypes.string,value:React.PropTypes.string,id:React.PropTypes.string,disabled:React.PropTypes.bool,required:React.PropTypes.bool,errorMessage:React.PropTypes.string,onUserInput:React.PropTypes.func,onUserBlur:React.PropTypes.func},getDefaultProps:function(){return{name:"",label:"",value:"",id:null,disabled:!1,required:!1,errorMessage:"",onUserInput:function(){console.warn("onUserInput() callback is not set")},onUserBlur:function(){}}},handleChange:function(e){this.props.onUserInput(this.props.name,e.target.value)},handleBlur:function(e){this.props.onUserBlur(this.props.name,e.target.value)},render:function(){var disabled=this.props.disabled?"disabled":null,required=this.props.required?"required":null,errorMessage=null,requiredHTML=null,elementClass="row form-group";return required&&(requiredHTML=React.createElement("span",{className:"text-danger"},"*")),this.props.errorMessage&&(errorMessage=React.createElement("span",null,this.props.errorMessage),elementClass="row form-group has-error"),React.createElement("div",{className:elementClass},React.createElement("label",{className:"col-sm-3 control-label",htmlFor:this.props.id},this.props.label,requiredHTML),React.createElement("div",{className:"col-sm-9"},React.createElement("input",{type:"text",className:"form-control",name:this.props.name,id:this.props.id,value:this.props.value||"",required:required,disabled:disabled,onChange:this.handleChange,onBlur:this.handleBlur}),errorMessage))}}),DateElement=React.createClass({displayName:"DateElement",propTypes:{name:React.PropTypes.string.isRequired,label:React.PropTypes.string,value:React.PropTypes.string,id:React.PropTypes.string,maxYear:React.PropTypes.string,disabled:React.PropTypes.bool,required:React.PropTypes.bool,onUserInput:React.PropTypes.func},getDefaultProps:function(){return{name:"",label:"",value:"",id:null,maxYear:"9999-12-31",disabled:!1,required:!1,onUserInput:function(){console.warn("onUserInput() callback is not set")}}},handleChange:function(e){this.props.onUserInput(this.props.name,e.target.value)},render:function(){var disabled=this.props.disabled?"disabled":null,required=this.props.required?"required":null,requiredHTML=null;return required&&(requiredHTML=React.createElement("span",{className:"text-danger"},"*")),React.createElement("div",{className:"row form-group"},React.createElement("label",{className:"col-sm-3 control-label",htmlFor:this.props.label},this.props.label,requiredHTML),React.createElement("div",{className:"col-sm-9"},React.createElement("input",{type:"date",className:"form-control",name:this.props.name,id:this.props.id,min:this.props.minYear,max:this.props.maxYear,onChange:this.handleChange,value:this.props.value||"",required:required,disabled:disabled})))}}),NumericElement=React.createClass({displayName:"NumericElement",propTypes:{name:React.PropTypes.string.isRequired,min:React.PropTypes.number.isRequired,max:React.PropTypes.number.isRequired,label:React.PropTypes.string,value:React.PropTypes.string,id:React.PropTypes.string,disabled:React.PropTypes.bool,required:React.PropTypes.bool,onUserInput:React.PropTypes.func},getDefaultProps:function(){return{name:"",min:null,max:null,label:"",value:"",id:null,required:!1,disabled:!1,onUserInput:function(){console.warn("onUserInput() callback is not set")}}},handleChange:function(e){this.props.onUserInput(this.props.name,e.target.value)},render:function(){var disabled=this.props.disabled?"disabled":null,required=this.props.required?"required":null,requiredHTML=null;return React.createElement("div",{className:"row form-group"},React.createElement("label",{className:"col-sm-3 control-label",htmlFor:this.props.id},this.props.label,requiredHTML),React.createElement("div",{className:"col-sm-9"},React.createElement("input",{type:"number",className:"form-control",name:this.props.name,id:this.props.id,min:this.props.min,max:this.props.max,value:this.props.value,disabled:disabled,required:required,onChange:this.handleChange})))}}),FileElement=React.createClass({displayName:"FileElement",propTypes:{name:React.PropTypes.string.isRequired,label:React.PropTypes.string,value:React.PropTypes.oneOfType([React.PropTypes.string,React.PropTypes.object]),id:React.PropTypes.string,disabled:React.PropTypes.bool,required:React.PropTypes.bool,hasError:React.PropTypes.bool,errorMessage:React.PropTypes.string,onUserInput:React.PropTypes.func},getDefaultProps:function(){return{name:"",label:"File to Upload",value:"",id:null,disabled:!1,required:!1,hasError:!1,errorMessage:"The field is required!",onUserInput:function(){console.warn("onUserInput() callback is not set")}}},handleChange:function(e){var file=e.target.files[0]?e.target.files[0]:"";this.props.onUserInput(this.props.name,file)},render:function(){var required=this.props.required?"required":null,fileName=this.props.value?this.props.value.name:void 0,requiredHTML=null,errorMessage="",elementClass="row form-group";required&&(requiredHTML=React.createElement("span",{className:"text-danger"},"*"));var truncateEllipsis={display:"table",tableLayout:"fixed",width:"100%",whiteSpace:"nowrap"},truncateEllipsisChild={display:"table-cell",overflow:"hidden",textOverflow:"ellipsis"};this.props.hasError&&(errorMessage=this.props.errorMessage,elementClass="row form-group has-error");var fileHTML=document.querySelector(".fileUpload");return fileHTML&&!fileName&&(fileHTML.value=""),this.props.disabled?(truncateEllipsis.paddingTop="7px",React.createElement("div",{className:elementClass},React.createElement("label",{className:"col-sm-3 control-label"},this.props.label),React.createElement("div",{className:"col-sm-9"},React.createElement("div",{style:truncateEllipsis},React.createElement("span",{style:truncateEllipsisChild},fileName))))):React.createElement("div",{className:elementClass},React.createElement("label",{className:"col-sm-3 control-label"},this.props.label,requiredHTML),React.createElement("div",{className:"col-sm-9"},React.createElement("div",{className:"input-group"},React.createElement("div",{tabIndex:"-1",className:"form-control file-caption kv-fileinput-caption"},React.createElement("div",{style:truncateEllipsis},React.createElement("span",{style:truncateEllipsisChild},fileName)),React.createElement("div",{className:"file-caption-name",id:"video_file"})),React.createElement("div",{className:"input-group-btn"},React.createElement("div",{className:"btn btn-primary btn-file"},React.createElement("i",{className:"glyphicon glyphicon-folder-open"})," Browse",React.createElement("input",{type:"file",className:"fileUpload",name:this.props.name,onChange:this.handleChange,required:required})))),React.createElement("span",null,errorMessage)))}}),StaticElement=React.createClass({displayName:"StaticElement",mixins:[React.addons.PureRenderMixin],propTypes:{label:React.PropTypes.string,text:React.PropTypes.oneOfType([React.PropTypes.string,React.PropTypes.element])},getDefaultProps:function(){return{label:"",text:null}},render:function(){return React.createElement("div",{className:"row form-group"},React.createElement("label",{className:"col-sm-3 control-label"},this.props.label),React.createElement("div",{className:"col-sm-9"},React.createElement("p",{className:"form-control-static"},this.props.text)))}}),LinkElement=React.createClass({displayName:"LinkElement",mixins:[React.addons.PureRenderMixin],propTypes:{label:React.PropTypes.string,text:React.PropTypes.oneOfType([React.PropTypes.string,React.PropTypes.element]),href:React.PropTypes.string},getDefaultProps:function(){return{label:"",text:null,href:null}},render:function(){return React.createElement("div",{className:"row form-group"},React.createElement("label",{className:"col-sm-3 control-label"},this.props.label),React.createElement("div",{className:"col-sm-9"},React.createElement("p",{className:"form-control-static"},React.createElement("a",{href:this.props.href},this.props.text))))}}),ButtonElement=React.createClass({displayName:"ButtonElement",propTypes:{label:React.PropTypes.string,type:React.PropTypes.string,onUserInput:React.PropTypes.func},getDefaultProps:function(){return{label:"Submit",type:"submit",buttonClass:"btn btn-primary",columnSize:"col-sm-9 col-sm-offset-3",onUserInput:function(){console.warn("onUserInput() callback is not set")}}},handleClick:function(e){this.props.onUserInput(e)},render:function(){return React.createElement("div",{className:"row form-group"},React.createElement("div",{className:this.props.columnSize},React.createElement("button",{type:this.props.type,className:this.props.buttonClass,onClick:this.handleClick},this.props.label)))}}),LorisElement=React.createClass({displayName:"LorisElement",render:function(){var elementProps=this.props.element;elementProps.ref=elementProps.name,elementProps.onUserInput=this.props.onUserInput;var elementHtml=React.createElement("div",null);switch(elementProps.type){case"text":elementHtml=React.createElement(TextboxElement,elementProps);break;case"tags":elementHtml=React.createElement(TagsElement,elementProps);break;case"select":elementHtml=React.createElement(SelectElement,elementProps);break;case"search":elementHtml=React.createElement(SearchableDropdown,elementProps);break;case"date":elementHtml=React.createElement(DateElement,elementProps);break;case"numeric":elementHtml=React.createElement(NumericElement,elementProps);break;case"textarea":elementHtml=React.createElement(TextareaElement,elementProps);break;case"file":elementHtml=React.createElement(FileElement,elementProps);break;case"static":elementHtml=React.createElement(StaticElement,elementProps);break;case"link":elementHtml=React.createElement(LinkElement,elementProps);break;default:console.warn("Element of type "+elementProps.type+" is not currently implemented!")}return elementHtml}});window.FormElement=FormElement,window.SelectElement=SelectElement,window.TagsElement=TagsElement,window.SearchableDropdown=SearchableDropdown,window.TextareaElement=TextareaElement,window.TextboxElement=TextboxElement,window.DateElement=DateElement,window.NumericElement=NumericElement,window.FileElement=FileElement,window.StaticElement=StaticElement,window.LinkElement=LinkElement,window.ButtonElement=ButtonElement,window.LorisElement=LorisElement,exports.default={FormElement:FormElement,SelectElement:SelectElement,TagsElement:TagsElement,SearchableDropdown:SearchableDropdown,TextareaElement:TextareaElement,TextboxElement:TextboxElement,DateElement:DateElement,NumericElement:NumericElement,FileElement:FileElement,StaticElement:StaticElement,LinkElement:LinkElement,ButtonElement:ButtonElement,LorisElement:LorisElement}}]);
 //# sourceMappingURL=Form.js.map
\ No newline at end of file
diff --git a/htdocs/js/components/Markdown.js b/htdocs/js/components/Markdown.js
index aeb8b143d97..57892edf631 100644
--- a/htdocs/js/components/Markdown.js
+++ b/htdocs/js/components/Markdown.js
@@ -1,2 +1,2 @@
-!function(modules){function __webpack_require__(moduleId){if(installedModules[moduleId])return installedModules[moduleId].exports;var module=installedModules[moduleId]={exports:{},id:moduleId,loaded:!1};return modules[moduleId].call(module.exports,module,module.exports,__webpack_require__),module.loaded=!0,module.exports}var installedModules={};return __webpack_require__.m=modules,__webpack_require__.c=installedModules,__webpack_require__.p="",__webpack_require__(0)}([function(module,exports){"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var Markdown=React.createClass({displayName:"Markdown",propTypes:{content:React.PropTypes.string.isRequired},render:function(){for(var fixedNewlines=this.props.content.replace("\r\n","\n"),paragraphs=fixedNewlines.split("\n\n"),headersRe=/^(#+)\s+(.+)$/,boldRe1=/(\*\*)(.+?)(\*\*)/g,boldRe2=/(__)(.+?)(__)/g,boldCallback=function(match,start,content,end,offset,val){return"<b>"+content+"</b>"},italRe1=/(\*)(.+?)(\*)/g,italRe2=/(_)(.+?)(_)/g,italCallback=function(match,start,content,end,offset,val){return"<i>"+content+"</i>"},linkRe=/\[(.+?)\]\((.+?)\)/g,linkCallback=function(match,text,link,offset,val){return'<a href="'+link+'">'+text+"</a>"},hlevel=1,headerCallback=function(match,headerLevel,headerContent,offset,val){return hlevel=headerLevel.length,headerContent},i=0;i<paragraphs.length;i++)if("#"===paragraphs[i][0])switch(hlevel=1,paragraphs[i]=paragraphs[i].replace(headersRe,headerCallback),hlevel){case 6:paragraphs[i]=React.createElement("h6",null,paragraphs[i]);break;case 5:paragraphs[i]=React.createElement("h5",null,paragraphs[i]);break;case 4:paragraphs[i]=React.createElement("h4",null,paragraphs[i]);break;case 3:paragraphs[i]=React.createElement("h3",null,paragraphs[i]);break;case 2:paragraphs[i]=React.createElement("h2",null,paragraphs[i]);break;case 1:default:paragraphs[i]=React.createElement("h1",null,paragraphs[i])}else{var paramd=paragraphs[i];paramd=paramd.replace(boldRe1,boldCallback),paramd=paramd.replace(boldRe2,boldCallback),paramd=paramd.replace(italRe1,italCallback),paramd=paramd.replace(italRe2,italCallback),paramd=paramd.replace(linkRe,linkCallback),paragraphs[i]=React.createElement("p",{dangerouslySetInnerHTML:{__html:paramd}})}return React.createElement("div",null,paragraphs)}}),RMarkdown=React.createFactory(Markdown);window.Markdown=Markdown,window.RMarkdown=RMarkdown,exports.default=Markdown}]);
+!function(modules){function __webpack_require__(moduleId){if(installedModules[moduleId])return installedModules[moduleId].exports;var module=installedModules[moduleId]={exports:{},id:moduleId,loaded:!1};return modules[moduleId].call(module.exports,module,module.exports,__webpack_require__),module.loaded=!0,module.exports}var installedModules={};return __webpack_require__.m=modules,__webpack_require__.c=installedModules,__webpack_require__.p="",__webpack_require__(0)}([function(module,exports){"use strict";function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}Object.defineProperty(exports,"__esModule",{value:!0});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),Markdown=function(_React$Component){function Markdown(){return _classCallCheck(this,Markdown),_possibleConstructorReturn(this,(Markdown.__proto__||Object.getPrototypeOf(Markdown)).apply(this,arguments))}return _inherits(Markdown,_React$Component),_createClass(Markdown,[{key:"htmlSpecialCharsDecode",value:function(text){return text.replace(/&amp;/g,"&").replace(/&quot;/g,'"')}},{key:"render",value:function(){function boldCallback(match,start,content,end,offset,val){return"<b>"+content+"</b>"}function italCallback(match,start,content,end,offset,val){return"<i>"+content+"</i>"}function linkCallback(match,text,link,offset,val){return'<a href="'+link+'">'+text+"</a>"}function headerCallback(match,headerLevel,headerContent,offset,val){return hlevel=headerLevel.length,headerContent}var fixedNewLines=this.props.content.replace(/\r\n/g,"\n");fixedNewLines=this.htmlSpecialCharsDecode(fixedNewLines);for(var paragraphs=fixedNewLines.split("\n\n"),headersRe=/^(#+)\s+(.+)$/,boldRe1=/(\*\*)(.+?)(\*\*)/g,boldRe2=/(__)(.+?)(__)/g,italRe1=/(\*)(.+?)(\*)/g,italRe2=/(_)(.+?)(_)/g,linkRe=/\[(.+?)\]\((.+?)\)/g,hlevel=1,i=0;i<paragraphs.length;i++)if("#"===paragraphs[i][0])switch(hlevel=1,paragraphs[i]=paragraphs[i].replace(headersRe,headerCallback),hlevel){case 6:paragraphs[i]=React.createElement("h6",null,paragraphs[i]);break;case 5:paragraphs[i]=React.createElement("h5",null,paragraphs[i]);break;case 4:paragraphs[i]=React.createElement("h4",null,paragraphs[i]);break;case 3:paragraphs[i]=React.createElement("h3",null,paragraphs[i]);break;case 2:paragraphs[i]=React.createElement("h2",null,paragraphs[i]);break;case 1:default:paragraphs[i]=React.createElement("h1",null,paragraphs[i])}else{var paramd=paragraphs[i];paramd=paramd.replace(boldRe1,boldCallback),paramd=paramd.replace(boldRe2,boldCallback),paramd=paramd.replace(italRe1,italCallback),paramd=paramd.replace(italRe2,italCallback),paramd=paramd.replace(linkRe,linkCallback),paragraphs[i]=React.createElement("p",{dangerouslySetInnerHTML:{__html:paramd}})}return React.createElement("div",null,paragraphs)}}]),Markdown}(React.Component);Markdown.propTypes={content:React.PropTypes.string.isRequired};var RMarkdown=React.createFactory(Markdown);window.Markdown=Markdown,window.RMarkdown=RMarkdown,exports.default=Markdown}]);
 //# sourceMappingURL=Markdown.js.map
\ No newline at end of file
diff --git a/htdocs/js/components/StaticDataTable.js b/htdocs/js/components/StaticDataTable.js
index 6a8ff551341..6b3ba1faf7a 100644
--- a/htdocs/js/components/StaticDataTable.js
+++ b/htdocs/js/components/StaticDataTable.js
@@ -1,2 +1,2 @@
-!function(modules){function __webpack_require__(moduleId){if(installedModules[moduleId])return installedModules[moduleId].exports;var module=installedModules[moduleId]={exports:{},id:moduleId,loaded:!1};return modules[moduleId].call(module.exports,module,module.exports,__webpack_require__),module.loaded=!0,module.exports}var installedModules={};return __webpack_require__.m=modules,__webpack_require__.c=installedModules,__webpack_require__.p="",__webpack_require__(0)}([function(module,exports){"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var _typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(obj){return typeof obj}:function(obj){return obj&&"function"==typeof Symbol&&obj.constructor===Symbol&&obj!==Symbol.prototype?"symbol":typeof obj},StaticDataTable=React.createClass({displayName:"StaticDataTable",mixins:[React.addons.PureRenderMixin],propTypes:{Headers:React.PropTypes.array.isRequired,Data:React.PropTypes.array.isRequired,RowNumLabel:React.PropTypes.string,getFormattedCell:React.PropTypes.func,onSort:React.PropTypes.func},componentDidMount:function(){jQuery.fn.DynamicTable&&(this.props.freezeColumn?$("#dynamictable").DynamicTable({freezeColumn:this.props.freezeColumn}):$("#dynamictable").DynamicTable());var modulePrefs=JSON.parse(localStorage.getItem("modulePrefs"));null===modulePrefs&&(modulePrefs={}),void 0===modulePrefs[loris.TestName]&&(modulePrefs[loris.TestName]={},modulePrefs[loris.TestName].rowsPerPage=this.state.RowsPerPage);var rowsPerPage=modulePrefs[loris.TestName].rowsPerPage;this.setState({RowsPerPage:rowsPerPage}),this.modulePrefs=modulePrefs},componentDidUpdate:function(prevProps,prevState){if(jQuery.fn.DynamicTable&&(this.props.freezeColumn?$("#dynamictable").DynamicTable({freezeColumn:this.props.freezeColumn}):$("#dynamictable").DynamicTable()),this.props.onSort&&(this.state.SortColumn!==prevState.SortColumn||this.state.SortOrder!==prevState.SortOrder)){var index=this.getSortedRows();this.props.onSort(index,this.props.Data,this.props.Headers)}},getInitialState:function(){return{PageNumber:1,SortColumn:-1,SortOrder:"ASC",RowsPerPage:20}},getDefaultProps:function(){return{Headers:[],Data:{},RowNumLabel:"No.",Filter:{}}},changePage:function(pageNo){this.setState({PageNumber:pageNo})},setSortColumn:function(colNumber){var that=this;return function(e){that.state.SortColumn===colNumber?that.setState({SortOrder:"ASC"===that.state.SortOrder?"DESC":"ASC"}):that.setState({SortColumn:colNumber})}},changeRowsPerPage:function(val){var rowsPerPage=val.target.value,modulePrefs=this.modulePrefs;modulePrefs[loris.TestName].rowsPerPage=rowsPerPage,localStorage.setItem("modulePrefs",JSON.stringify(modulePrefs)),this.setState({RowsPerPage:rowsPerPage,PageNumber:1})},downloadCSV:function(csvData){var csvworker=new Worker(loris.BaseURL+"/js/workers/savecsv.js");csvworker.addEventListener("message",function(e){var dataURL,dataDate,link;"SaveCSV"===e.data.cmd&&(dataDate=(new Date).toISOString(),dataURL=window.URL.createObjectURL(e.data.message),link=document.createElement("a"),link.download="data-"+dataDate+".csv",link.type="text/csv",link.href=dataURL,document.body.appendChild(link),$(link)[0].click(),document.body.removeChild(link))}),csvworker.postMessage({cmd:"SaveFile",data:csvData,headers:this.props.Headers,identifiers:this.props.RowNameMap})},countFilteredRows:function(){for(var filterMatchCount=0,filterValuesCount=this.props.Filter?Object.keys(this.props.Filter).length:0,tableData=this.props.Data,headersData=this.props.Headers,i=0;i<tableData.length;i++){for(var headerCount=0,j=0;j<headersData.length;j++){var data=tableData[i]?tableData[i][j]:null;this.hasFilterKeyword(headersData[j],data)&&headerCount++}headerCount===filterValuesCount&&filterMatchCount++}var hasFilters=0!==filterValuesCount;return 0===filterMatchCount&&hasFilters?0:0===filterMatchCount?tableData.length:filterMatchCount},toCamelCase:function(str){return str.replace(/(?:^\w|[A-Z]|\b\w|\s+)/g,function(match,index){return 0===Number(match)?"":0===index?match.toLowerCase():match.toUpperCase()})},getSortedRows:function(){for(var index=[],i=0;i<this.props.Data.length;i+=1){var val=this.props.Data[i][this.state.SortColumn]||void 0;this.state.SortColumn===-1&&(val=i+1);var isString="string"==typeof val||val instanceof String,isNumber=!isNaN(val)&&"object"!==("undefined"==typeof val?"undefined":_typeof(val));val="."===val?null:isNumber?Number(val):isString?val.toLowerCase():void 0,this.props.RowNameMap?index.push({RowIdx:i,Value:val,Content:this.props.RowNameMap[i]}):index.push({RowIdx:i,Value:val,Content:i+1})}return index.sort(function(a,b){if("ASC"===this.state.SortOrder){if(a.Value===b.Value){if(a.RowIdx<b.RowIdx)return-1;if(a.RowIdx>b.RowIdx)return 1}if(null===a.Value||"undefined"==typeof a.Value)return-1;if(null===b.Value||"undefined"==typeof b.Value)return 1;if(a.Value<b.Value)return-1;if(a.Value>b.Value)return 1}else{if(a.Value===b.Value){if(a.RowIdx<b.RowIdx)return 1;if(a.RowIdx>b.RowIdx)return-1}if(null===a.Value||"undefined"==typeof a.Value)return 1;if(null===b.Value||"undefined"==typeof b.Value)return-1;if(a.Value<b.Value)return 1;if(a.Value>b.Value)return-1}return 0}.bind(this)),index},hasFilterKeyword:function(headerData,data){var header=this.toCamelCase(headerData),filterData=null,exactMatch=!1;if(this.props.Filter[header]&&(filterData=this.props.Filter[header].value,exactMatch=this.props.Filter[header].exactMatch),null===filterData||null===data)return!1;if("number"==typeof filterData){var intData=Number.parseInt(data,10);return filterData===intData}if("string"==typeof filterData){var searchKey=filterData.toLowerCase(),searchString=data.toLowerCase();return exactMatch?searchString===searchKey:searchString.indexOf(searchKey)>-1}return!1},render:function(){if(null===this.props.Data||0===this.props.Data.length)return React.createElement("div",{className:"alert alert-info no-result-found-panel"},React.createElement("strong",null,"No result found."));for(var rowsPerPage=this.state.RowsPerPage,headers=[React.createElement("th",{key:"th_col_0",onClick:this.setSortColumn(-1)},this.props.RowNumLabel)],i=0;i<this.props.Headers.length;i+=1)if("undefined"==typeof loris.hiddenHeaders||loris.hiddenHeaders.indexOf(this.props.Headers[i])===-1){var colIndex=i+1;this.props.Headers[i]===this.props.freezeColumn?headers.push(React.createElement("th",{key:"th_col_"+colIndex,id:this.props.freezeColumn,onClick:this.setSortColumn(i)},this.props.Headers[i])):headers.push(React.createElement("th",{key:"th_col_"+colIndex,onClick:this.setSortColumn(i)},this.props.Headers[i]))}for(var rows=[],curRow=[],index=this.getSortedRows(),matchesFound=0,filteredRows=this.countFilteredRows(),currentPageRow=rowsPerPage*(this.state.PageNumber-1),filteredData=[],_i=0;_i<this.props.Data.length&&rows.length<rowsPerPage;_i++){curRow=[];for(var filterMatchCount=0,j=0;j<this.props.Headers.length;j+=1){var data="Unknown";this.props.Data[index[_i].RowIdx]&&(data=this.props.Data[index[_i].RowIdx][j]),this.hasFilterKeyword(this.props.Headers[j],data)&&(filterMatchCount++,filteredData.push(this.props.Data[index[_i].RowIdx]));var key="td_col_"+j;this.props.getFormattedCell?(data=this.props.getFormattedCell(this.props.Headers[j],data,this.props.Data[index[_i].RowIdx],this.props.Headers),null!==data&&curRow.push(React.addons.createFragment({data:data}))):curRow.push(React.createElement("td",{key:key},data))}if(Object.keys(this.props.Filter).length===filterMatchCount&&(matchesFound++,matchesFound>currentPageRow)){var rowIndex=index[_i].Content;rows.push(React.createElement("tr",{key:"tr_"+rowIndex,colSpan:headers.length},React.createElement("td",null,rowIndex),curRow))}}var RowsPerPageDropdown=React.createElement("select",{className:"input-sm perPage",onChange:this.changeRowsPerPage,value:this.state.RowsPerPage},React.createElement("option",null,"20"),React.createElement("option",null,"50"),React.createElement("option",null,"100"),React.createElement("option",null,"1000"),React.createElement("option",null,"5000"),React.createElement("option",null,"10000")),csvData=this.props.Data;return this.props.Filter&&filteredData.length>0&&(csvData=filteredData),React.createElement("div",{className:"panel panel-default"},React.createElement("div",{className:"table-header panel-heading"},React.createElement("div",{className:"row"},React.createElement("div",{className:"col-xs-12"},rows.length," rows displayed of ",filteredRows,". (Maximum rows per page: ",RowsPerPageDropdown,")",React.createElement("div",{className:"pull-right"},React.createElement(PaginationLinks,{Total:filteredRows,onChangePage:this.changePage,RowsPerPage:rowsPerPage,Active:this.state.PageNumber}))))),React.createElement("table",{className:"table table-hover table-primary table-bordered",id:"dynamictable"},React.createElement("thead",null,React.createElement("tr",{className:"info"},headers)),React.createElement("tbody",null,rows)),React.createElement("div",{className:"panel-footer table-footer"},React.createElement("div",{className:"row"},React.createElement("div",{className:"col-xs-12"},React.createElement("div",{className:"col-xs-12 footerText"},rows.length," rows displayed of ",filteredRows,". (Maximum rows per page: ",RowsPerPageDropdown,")"),React.createElement("div",{className:"col-xs-6"},React.createElement("button",{className:"btn btn-primary downloadCSV",onClick:this.downloadCSV.bind(null,csvData)},"Download Table as CSV")),React.createElement("div",{className:"pull-right"},React.createElement(PaginationLinks,{Total:filteredRows,onChangePage:this.changePage,RowsPerPage:rowsPerPage,Active:this.state.PageNumber}))))))}}),RStaticDataTable=React.createFactory(StaticDataTable);window.StaticDataTable=StaticDataTable,window.RStaticDataTable=RStaticDataTable,exports.default=StaticDataTable}]);
+!function(modules){function __webpack_require__(moduleId){if(installedModules[moduleId])return installedModules[moduleId].exports;var module=installedModules[moduleId]={exports:{},id:moduleId,loaded:!1};return modules[moduleId].call(module.exports,module,module.exports,__webpack_require__),module.loaded=!0,module.exports}var installedModules={};return __webpack_require__.m=modules,__webpack_require__.c=installedModules,__webpack_require__.p="",__webpack_require__(0)}([function(module,exports){"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var _typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(obj){return typeof obj}:function(obj){return obj&&"function"==typeof Symbol&&obj.constructor===Symbol&&obj!==Symbol.prototype?"symbol":typeof obj},StaticDataTable=React.createClass({displayName:"StaticDataTable",mixins:[React.addons.PureRenderMixin],propTypes:{Headers:React.PropTypes.array.isRequired,Data:React.PropTypes.array.isRequired,RowNumLabel:React.PropTypes.string,getFormattedCell:React.PropTypes.func,onSort:React.PropTypes.func},componentDidMount:function(){jQuery.fn.DynamicTable&&(this.props.freezeColumn?$("#dynamictable").DynamicTable({freezeColumn:this.props.freezeColumn}):$("#dynamictable").DynamicTable());var modulePrefs=JSON.parse(localStorage.getItem("modulePrefs"));null===modulePrefs&&(modulePrefs={}),void 0===modulePrefs[loris.TestName]&&(modulePrefs[loris.TestName]={},modulePrefs[loris.TestName].rowsPerPage=this.state.RowsPerPage);var rowsPerPage=modulePrefs[loris.TestName].rowsPerPage;this.setState({RowsPerPage:rowsPerPage}),this.modulePrefs=modulePrefs},componentDidUpdate:function(prevProps,prevState){if(jQuery.fn.DynamicTable&&(this.props.freezeColumn?$("#dynamictable").DynamicTable({freezeColumn:this.props.freezeColumn}):$("#dynamictable").DynamicTable()),this.props.onSort&&(this.state.SortColumn!==prevState.SortColumn||this.state.SortOrder!==prevState.SortOrder)){var index=this.getSortedRows();this.props.onSort(index,this.props.Data,this.props.Headers)}},getInitialState:function(){return{PageNumber:1,SortColumn:-1,SortOrder:"ASC",RowsPerPage:20}},getDefaultProps:function(){return{Headers:[],Data:{},RowNumLabel:"No.",Filter:{}}},changePage:function(pageNo){this.setState({PageNumber:pageNo})},setSortColumn:function(colNumber){var that=this;return function(e){that.state.SortColumn===colNumber?that.setState({SortOrder:"ASC"===that.state.SortOrder?"DESC":"ASC"}):that.setState({SortColumn:colNumber})}},changeRowsPerPage:function(val){var rowsPerPage=val.target.value,modulePrefs=this.modulePrefs;modulePrefs[loris.TestName].rowsPerPage=rowsPerPage,localStorage.setItem("modulePrefs",JSON.stringify(modulePrefs)),this.setState({RowsPerPage:rowsPerPage,PageNumber:1})},downloadCSV:function(csvData){var csvworker=new Worker(loris.BaseURL+"/js/workers/savecsv.js");csvworker.addEventListener("message",function(e){var dataURL,dataDate,link;"SaveCSV"===e.data.cmd&&(dataDate=(new Date).toISOString(),dataURL=window.URL.createObjectURL(e.data.message),link=document.createElement("a"),link.download="data-"+dataDate+".csv",link.type="text/csv",link.href=dataURL,document.body.appendChild(link),$(link)[0].click(),document.body.removeChild(link))}),csvworker.postMessage({cmd:"SaveFile",data:csvData,headers:this.props.Headers,identifiers:this.props.RowNameMap})},countFilteredRows:function(){for(var filterMatchCount=0,filterValuesCount=this.props.Filter?Object.keys(this.props.Filter).length:0,tableData=this.props.Data,headersData=this.props.Headers,i=0;i<tableData.length;i++){for(var headerCount=0,j=0;j<headersData.length;j++){var data=tableData[i]?tableData[i][j]:null;this.hasFilterKeyword(headersData[j],data)&&headerCount++}headerCount===filterValuesCount&&filterMatchCount++}var hasFilters=0!==filterValuesCount;return 0===filterMatchCount&&hasFilters?0:0===filterMatchCount?tableData.length:filterMatchCount},toCamelCase:function(str){return str.replace(/(?:^\w|[A-Z]|\b\w|\s+)/g,function(match,index){return 0===Number(match)?"":0===index?match.toLowerCase():match.toUpperCase()})},getSortedRows:function(){for(var index=[],i=0;i<this.props.Data.length;i+=1){var val=this.props.Data[i][this.state.SortColumn]||void 0;this.state.SortColumn===-1&&(val=i+1);var isString="string"==typeof val||val instanceof String,isNumber=!isNaN(val)&&"object"!==("undefined"==typeof val?"undefined":_typeof(val));val="."===val?null:isNumber?Number(val):isString?val.toLowerCase():void 0,this.props.RowNameMap?index.push({RowIdx:i,Value:val,Content:this.props.RowNameMap[i]}):index.push({RowIdx:i,Value:val,Content:i+1})}return index.sort(function(a,b){if("ASC"===this.state.SortOrder){if(a.Value===b.Value){if(a.RowIdx<b.RowIdx)return-1;if(a.RowIdx>b.RowIdx)return 1}if(null===a.Value||"undefined"==typeof a.Value)return-1;if(null===b.Value||"undefined"==typeof b.Value)return 1;if(a.Value<b.Value)return-1;if(a.Value>b.Value)return 1}else{if(a.Value===b.Value){if(a.RowIdx<b.RowIdx)return 1;if(a.RowIdx>b.RowIdx)return-1}if(null===a.Value||"undefined"==typeof a.Value)return 1;if(null===b.Value||"undefined"==typeof b.Value)return-1;if(a.Value<b.Value)return 1;if(a.Value>b.Value)return-1}return 0}.bind(this)),index},hasFilterKeyword:function(headerData,data){var header=this.toCamelCase(headerData),filterData=null,exactMatch=!1,result=!1,searchKey=null,searchString=null;if(this.props.Filter[header]&&(filterData=this.props.Filter[header].value,exactMatch=this.props.Filter[header].exactMatch),null===filterData||null===data)return!1;if("number"==typeof filterData){var intData=Number.parseInt(data,10);result=filterData===intData}if("string"==typeof filterData&&(searchKey=filterData.toLowerCase(),searchString=data.toLowerCase(),exactMatch&&(result=searchString===searchKey),result=searchString.indexOf(searchKey)>-1),"object"===("undefined"==typeof filterData?"undefined":_typeof(filterData)))for(var match=!1,i=0;i<filterData.length;i+=1)searchKey=filterData[i].toLowerCase(),searchString=data.toLowerCase(),match=searchString.indexOf(searchKey)>-1,match&&(result=!0);return result},render:function(){if(null===this.props.Data||0===this.props.Data.length)return React.createElement("div",{className:"alert alert-info no-result-found-panel"},React.createElement("strong",null,"No result found."));for(var rowsPerPage=this.state.RowsPerPage,headers=[React.createElement("th",{key:"th_col_0",onClick:this.setSortColumn(-1)},this.props.RowNumLabel)],i=0;i<this.props.Headers.length;i+=1)if("undefined"==typeof loris.hiddenHeaders||loris.hiddenHeaders.indexOf(this.props.Headers[i])===-1){var colIndex=i+1;this.props.Headers[i]===this.props.freezeColumn?headers.push(React.createElement("th",{key:"th_col_"+colIndex,id:this.props.freezeColumn,onClick:this.setSortColumn(i)},this.props.Headers[i])):headers.push(React.createElement("th",{key:"th_col_"+colIndex,onClick:this.setSortColumn(i)},this.props.Headers[i]))}for(var rows=[],curRow=[],index=this.getSortedRows(),matchesFound=0,filteredRows=this.countFilteredRows(),currentPageRow=rowsPerPage*(this.state.PageNumber-1),filteredData=[],_i=0;_i<this.props.Data.length&&rows.length<rowsPerPage;_i++){curRow=[];for(var filterMatchCount=0,j=0;j<this.props.Headers.length;j+=1){var data="Unknown";this.props.Data[index[_i].RowIdx]&&(data=this.props.Data[index[_i].RowIdx][j]),this.hasFilterKeyword(this.props.Headers[j],data)&&(filterMatchCount++,filteredData.push(this.props.Data[index[_i].RowIdx]));var key="td_col_"+j;this.props.getFormattedCell?(data=this.props.getFormattedCell(this.props.Headers[j],data,this.props.Data[index[_i].RowIdx],this.props.Headers),null!==data&&curRow.push(React.addons.createFragment({data:data}))):curRow.push(React.createElement("td",{key:key},data))}if(Object.keys(this.props.Filter).length===filterMatchCount&&(matchesFound++,matchesFound>currentPageRow)){var rowIndex=index[_i].Content;rows.push(React.createElement("tr",{key:"tr_"+rowIndex,colSpan:headers.length},React.createElement("td",null,rowIndex),curRow))}}var RowsPerPageDropdown=React.createElement("select",{className:"input-sm perPage",onChange:this.changeRowsPerPage,value:this.state.RowsPerPage},React.createElement("option",null,"20"),React.createElement("option",null,"50"),React.createElement("option",null,"100"),React.createElement("option",null,"1000"),React.createElement("option",null,"5000"),React.createElement("option",null,"10000")),csvData=this.props.Data;return this.props.Filter&&filteredData.length>0&&(csvData=filteredData),React.createElement("div",{className:"panel panel-default"},React.createElement("div",{className:"table-header panel-heading"},React.createElement("div",{className:"row"},React.createElement("div",{className:"col-xs-12"},rows.length," rows displayed of ",filteredRows,". (Maximum rows per page: ",RowsPerPageDropdown,")",React.createElement("div",{className:"pull-right"},React.createElement(PaginationLinks,{Total:filteredRows,onChangePage:this.changePage,RowsPerPage:rowsPerPage,Active:this.state.PageNumber}))))),React.createElement("table",{className:"table table-hover table-primary table-bordered",id:"dynamictable"},React.createElement("thead",null,React.createElement("tr",{className:"info"},headers)),React.createElement("tbody",null,rows)),React.createElement("div",{className:"panel-footer table-footer"},React.createElement("div",{className:"row"},React.createElement("div",{className:"col-xs-12"},React.createElement("div",{className:"col-xs-12 footerText"},rows.length," rows displayed of ",filteredRows,". (Maximum rows per page: ",RowsPerPageDropdown,")"),React.createElement("div",{className:"col-xs-6"},React.createElement("button",{className:"btn btn-primary downloadCSV",onClick:this.downloadCSV.bind(null,csvData)},"Download Table as CSV")),React.createElement("div",{className:"pull-right"},React.createElement(PaginationLinks,{Total:filteredRows,onChangePage:this.changePage,RowsPerPage:rowsPerPage,Active:this.state.PageNumber}))))))}}),RStaticDataTable=React.createFactory(StaticDataTable);window.StaticDataTable=StaticDataTable,window.RStaticDataTable=RStaticDataTable,exports.default=StaticDataTable}]);
 //# sourceMappingURL=StaticDataTable.js.map
\ No newline at end of file
diff --git a/htdocs/js/helpHandler.js b/htdocs/js/helpHandler.js
index a9dc39c5010..bf25db163b0 100644
--- a/htdocs/js/helpHandler.js
+++ b/htdocs/js/helpHandler.js
@@ -25,39 +25,35 @@ $(document).ready(function() {
       var edit = document.createElement("BUTTON");
       var text = document.createTextNode("Edit");
       var button = document.createTextNode("Close");
-      var wrap;
+      var wrap = document.createElement("div");
+      var markdownContent = document.createElement("div");
 
+      // Render Markdown in wrap div.
+      // If help content is from Markdown helpfile.
       if (content.format === "markdown") {
-        wrap = document.createElement("div");
-        wrap.setAttribute("id", "help-wrapper");
         ReactDOM.render(RMarkdown({content: content.content}), wrap);
       } else {
-        wrap = document.createElement("pre");
-        wrap.setAttribute("id", "help-wrapper");
+        // If help content is from DB.
         wrap.innerHTML = "<hr id='help-separator'>";
         if (content.topic) {
           wrap.innerHTML = "<h3>" + content.topic + "</h3>";
-        } else {
-          // This is a hack because otherwise the alignment of the edit/close
-          // buttons gets screwed up. The CSS should eventually be fixed and
-          // this removed.
-          wrap.innerHTML = "<h3></h3>";
         }
-        wrap.innerHTML += content.content;
+        ReactDOM.render(RMarkdown({content: content.content}), markdownContent);
+        wrap.appendChild(markdownContent);
         if (content.updated) {
           wrap.innerHTML = wrap.innerHTML + "<hr>Last updated: " + content.updated;
         }
       }
+      wrap.setAttribute("id", "help-wrapper");
       btn.appendChild(button);
       btn.className = "btn btn-default";
       btn.setAttribute("id", "helpclose");
       edit.appendChild(text);
       edit.className = "btn btn-default";
       edit.setAttribute("id", "helpedit");
-      div.appendChild(wrap);
       div.appendChild(btn);
 
-      // Markdown format content came from the filesystem and can't
+      // If help content comes from DB `help` table and can
       // be edited online.
       if (loris.userHasPermission("context_help") && content.format !== 'markdown') {
         div.appendChild(edit);
@@ -68,6 +64,7 @@ $(document).ready(function() {
             getParams.testName + "&subsection=" + getParams.subtest, "_self");
         });
       }
+      div.appendChild(wrap);
       document.getElementById('page').appendChild(div);
       div.setAttribute("class", "help-content");
       $(div).addClass('visible');
diff --git a/htdocs/js/util/queryString.js b/htdocs/js/util/queryString.js
index 64c76bbbede..d4228f9d7d9 100644
--- a/htdocs/js/util/queryString.js
+++ b/htdocs/js/util/queryString.js
@@ -50,11 +50,12 @@ var QueryString = {
     // Deep copy of object representation of query
     var queryStringObj = JSON.parse(JSON.stringify(currentQuery));
 
-    // Make sure that both key and value are of string type
-    if (typeof fieldName !== "string" || typeof fieldValue !== "string") {
+    // Make sure that key is of string type and value is of string or object type
+    if (typeof fieldName !== 'string' || (typeof fieldValue !== 'string' && typeof fieldValue !== 'object')) {
       console.error(
         "Error in QueryString.set(): \n" +
-        "\tfieldName and fieldValue must be of type string!"
+        "\tfieldName must be of type string and" +
+        "fieldValue must be of type string or object!"
       );
       return queryStringObj;
     }
diff --git a/htdocs/main.css b/htdocs/main.css
index 7f459a77776..7c19c7968d1 100644
--- a/htdocs/main.css
+++ b/htdocs/main.css
@@ -29,6 +29,7 @@ html, body {
 	font-family: verdana, sans-serif;
 	font-size: 90%;
 }
+
 #page {
     min-height: 100%;
     position: relative;
@@ -686,24 +687,18 @@ tr.directentry {
     color: #FFFFFF;
     padding: 9.5px;
 }
-.help-content pre#help-wrapper {
-    white-space: pre-wrap;
-    word-break: normal;
-    background: #064785;
-}
 #help-seperator {
    margin-top: 50px;
     background: #064785;
 }
 #helpclose {
-   position: absolute;
-   right:    0;
-   top:   20px;
-   margin-right : 5px;
+   float: right;
+   margin: 10px;
+   margin-left: 0px;
 }
 #helpedit {
-   position: absolute;
-   right:    0;4, 45, 84
+   float: right;
+   margin: 10px;
 }
 .help-content h3 {
     color: #FFFFFF;
diff --git a/htdocs/mri/jiv/get_file.php b/htdocs/mri/jiv/get_file.php
index 442aae91484..29d8cd4faa5 100644
--- a/htdocs/mri/jiv/get_file.php
+++ b/htdocs/mri/jiv/get_file.php
@@ -38,20 +38,26 @@
 }
 
 // Checks that config settings are set
-$config =& NDB_Config::singleton();
-$paths  = $config->getSetting('paths');
+$config   =& NDB_Config::singleton();
+$paths    = $config->getSetting('paths');
+$pipeline = $config->getSetting('imaging_pipeline');
 
 // Basic config validation
 $imagePath    = $paths['imagePath'];
 $DownloadPath = $paths['DownloadPath'];
 $mincPath     = $paths['mincPath'];
-if (empty($imagePath) || empty($DownloadPath) || empty($mincPath)) {
+$tarchivePath = $pipeline['tarchiveLibraryDir'];
+if (empty($imagePath) || empty($DownloadPath)
+    || empty($mincPath) || empty($tarchivePath)
+) {
     error_log("ERROR: Config settings are missing");
     header("HTTP/1.1 500 Internal Server Error");
     exit(1);
 }
 
-if ($imagePath === '/' || $DownloadPath === '/' || $mincPath === '/') {
+if ($imagePath === '/' || $DownloadPath === '/'
+    || $mincPath === '/' || $tarchivePath === '/'
+) {
     error_log("ERROR: Path can not be root for security reasons.");
     header("HTTP/1.1 500 Internal Server Error");
     exit(2);
@@ -72,6 +78,7 @@
 // Find the extension
 $path_parts = pathinfo($File);
 $FileExt    = $path_parts['extension'];
+$FileBase   = $path_parts['basename'];
 
 //make sure that we have a .nii.gz image if FileExt equal gz
 if (strcmp($FileExt, "gz") == 0) {
@@ -92,6 +99,15 @@
     exit(4);
 }
 
+// If basename of $File starts with "DCM_", prefix automatically
+// inserted by the LORIS-MRI pipeline, identify it as $FileExt:
+// "DICOMTAR"
+// Caveat: this is not a real file extension, but a LORIS-MRI
+// convention to identify archived DICOMs
+if (strpos($FileBase, "DCM_") === 0) {
+    $FileExt = "DICOMTAR";
+}
+
 switch($FileExt) {
 case 'mnc':
     $FullPath         = $mincPath . '/' . $File;
@@ -133,6 +149,12 @@
     $MimeType         = 'image/vnd.nrrd';
     $DownloadFilename = basename($File);
     break;
+case 'DICOMTAR':
+    // ADD case for DICOMTAR
+    $FullPath         = $tarchivePath . '/' . $File;
+    $MimeType         = 'application/x-tar';
+    $DownloadFilename = basename($File);
+    break;
 default:
     $FullPath         = $DownloadPath . '/' . $File;
     $MimeType         = 'application/octet-stream';
diff --git a/jsx/FilterForm.js b/jsx/FilterForm.js
index f8c1c675b97..d189676d353 100644
--- a/jsx/FilterForm.js
+++ b/jsx/FilterForm.js
@@ -125,15 +125,17 @@ class FilterForm extends React.Component {
     if (this.props.filter) {
       filter = JSON.parse(JSON.stringify(this.props.filter));
     }
-
-    if (key && value) {
+    if (key) {
       filter[key] = {};
-      filter[key].value = value;
+      if (value.length === 0) {
+        filter[key].value = '';
+      } else if (key && value) {
+        filter[key].value = value;
+      }
       filter[key].exactMatch = (type === "SelectElement");
     } else if (filter && key && value === '') {
       delete filter[key];
     }
-
     return filter;
   }
 
@@ -145,8 +147,10 @@ class FilterForm extends React.Component {
    * @param {string} fieldValue - the value of the form element
    */
   onElementUpdate(type, fieldName, fieldValue) {
-    // Make sure both key/value are string before sending them to querystring
-    if (typeof fieldName !== "string" || typeof fieldValue !== "string") {
+    // Make sure key is of string type and value is of string or object type
+    // before sending them to querystring
+    if (typeof fieldName !== 'string' ||
+        (typeof fieldValue !== 'string' && typeof fieldValue !== 'object')) {
       return;
     }
 
diff --git a/jsx/Form.js b/jsx/Form.js
index 63f50e9179d..5c8e260891a 100644
--- a/jsx/Form.js
+++ b/jsx/Form.js
@@ -1,5 +1,5 @@
-/* exported FormElement, SelectElement, TextareaElement, TextboxElement, DateElement,
-NumericElement, FileElement, StaticElement, ButtonElement, LorisElement
+/* exported FormElement, SelectElement, TagsElement, TextareaElement, TextboxElement, DateElement,
+NumericElement, FileElement, StaticElement, LinkElement, ButtonElement, LorisElement
 */
 
 /**
@@ -134,6 +134,162 @@ var FormElement = React.createClass({
   }
 });
 
+/**
+ * Search Component
+ * React wrapper for a searchable dropdown
+ */
+class SearchableDropdown extends React.Component {
+  constructor() {
+    super();
+    this.getKeyFromValue = this.getKeyFromValue.bind(this);
+    this.handleChange = this.handleChange.bind(this);
+    this.handleBlur = this.handleBlur.bind(this);
+    this.getTextInputValue = this.getTextInputValue.bind(this);
+  }
+  getKeyFromValue(value) {
+    let options = this.props.options;
+    return Object.keys(options).find(function(o) {
+      return options[o] === value;
+    });
+  }
+
+  handleChange(e) {
+    let value = this.getKeyFromValue(e.target.value);
+    // if not in strict mode and key value is not defined (i.e., not in options)
+    // set value equal to e.target.value
+    if (!this.props.strictSearch && value === undefined) {
+      value = e.target.value;
+    }
+    this.props.onUserInput(this.props.name, value);
+  }
+
+  handleBlur(e) {
+    // null out entry if not present in options in strict mode
+    if (this.props.strictSearch) {
+      let value = e.target.value;
+      let options = this.props.options;
+      if (Object.values(options).indexOf(value) === -1) {
+        // empty string out both the hidden value as well as the input text
+        document.querySelector(`input[name="${this.props.name + '_input'}"]`).value = '';
+        this.props.onUserInput(this.props.name, '');
+      }
+    }
+  }
+
+  getTextInputValue() {
+    return document.querySelector(`input[name="${this.props.name + '_input'}"]`).value;
+  }
+
+  render() {
+    let required = this.props.required ? 'required' : null;
+    let disabled = this.props.disabled ? 'disabled' : null;
+    let options = this.props.options;
+    let strictMessage = 'Entry must be included in provided list of options.';
+    let errorMessage = null;
+    let requiredHTML = null;
+    let elementClass = 'row form-group';
+
+    // Add required asterix
+    if (required) {
+      requiredHTML = <span className="text-danger">*</span>;
+    }
+
+    // Add error message
+    if (this.props.errorMessage) {
+      errorMessage = <span>{this.props.errorMessage}</span>;
+      elementClass = 'row form-group has-error';
+    } else if (this.props.required && this.props.value === "") {
+      let msg = 'This field is required!';
+      msg += (this.props.strictSearch ? ' ' + strictMessage : '');
+      errorMessage = <span>{msg}</span>;
+      elementClass = 'row form-group has-error';
+    } else if (this.props.strictSearch && this.props.value === "") {
+      errorMessage = <span>{strictMessage}</span>;
+      elementClass = 'row form-group has-error';
+    }
+
+    // determine value to place into text input
+    let value;
+    // use value in options if valid
+    if (this.props.value !== undefined) {
+      if (Object.keys(options).indexOf(this.props.value) > -1) {
+        value = options[this.props.value];
+        // else, use input text value
+      } else {
+        value = this.getTextInputValue();
+      }
+    }
+
+    return (
+      <div className={elementClass}>
+        <label className="col-sm-3 control-label" htmlFor={this.props.label}>
+          {this.props.label}
+          {requiredHTML}
+        </label>
+        <div className="col-sm-9">
+          <input
+            type="text"
+            name={this.props.name + '_input'}
+            value={value}
+            id={this.props.id}
+            list={this.props.name + '_list'}
+            className="form-control"
+            disabled={disabled}
+            placeholder={this.props.placeHolder}
+            onChange={this.handleChange}
+            onBlur={this.handleBlur}
+          />
+          <datalist id={this.props.name + '_list'}>
+            {Object.keys(options).map(function(option) {
+              return (
+                <option value={options[option]} key={option}/>
+              );
+            })}
+          </datalist>
+          {errorMessage}
+        </div>
+      </div>
+    );
+  }
+}
+
+SearchableDropdown.propTypes = {
+  name: React.PropTypes.string.isRequired,
+  options: React.PropTypes.object.isRequired,
+  id: React.PropTypes.string,
+  // strictSearch, if set to true, will require that only options
+  // provided in the options prop can be submitted
+  strictSearch: React.PropTypes.bool,
+  label: React.PropTypes.string,
+  value: React.PropTypes.oneOfType([
+    React.PropTypes.string,
+    React.PropTypes.array
+  ]),
+  class: React.PropTypes.string,
+  disabled: React.PropTypes.bool,
+  required: React.PropTypes.bool,
+  errorMessage: React.PropTypes.string,
+  placeHolder: React.PropTypes.string,
+  onUserInput: React.PropTypes.func
+};
+
+SearchableDropdown.defaultProps = {
+  name: '',
+  options: {},
+  strictSearch: true,
+  label: '',
+  value: undefined,
+  id: '',
+  class: '',
+  disabled: false,
+  required: false,
+  errorMessage: '',
+  placeHolder: '',
+  onUserInput: function() {
+    console.warn('onUserInput() callback is not set');
+  }
+};
+
 /**
  * Select Component
  * React wrapper for a simple or 'multiple' <select> element.
@@ -235,7 +391,7 @@ var SelectElement = React.createClass({
             name={this.props.name}
             multiple={multiple}
             className="form-control"
-            id={this.props.label}
+            id={this.props.id}
             value={value}
             onChange={this.handleChange}
             required={required}
@@ -255,6 +411,271 @@ var SelectElement = React.createClass({
   }
 });
 
+/**
+ * Tags Component
+ * Allows for multiple values to be entered for a single field
+ *
+ * Comes in 3 flavors:
+ * 1: If options are passed and useSearch = true
+ *    input field is rendered as a searchable dropdown
+ * 2: If only options are passed, input is rendered as
+ *    a normal dropdown select
+ * 3: Without options, input is a normal, free text input
+ */
+
+class TagsElement extends React.Component {
+  constructor() {
+    super();
+    this.handleChange = this.handleChange.bind(this);
+    this.handleKeyPress = this.handleKeyPress.bind(this);
+    this.handleAdd = this.handleAdd.bind(this);
+    this.handleRemove = this.handleRemove.bind(this);
+    this.getKeyFromValue = this.getKeyFromValue.bind(this);
+    this.canAddItem = this.canAddItem.bind(this);
+  }
+
+  // pendingValKey is the placeholder variable for temporarily storing
+  // typed or selected items before adding them to the Tags
+  handleChange(e) {
+    this.props.onUserInput(this.props.pendingValKey, e.target.value);
+  }
+  // also add tags if enter key is hit within input field
+  handleKeyPress(e) {
+    if (e.keyCode === 13 || e.which === 13) {
+      e.preventDefault();
+      this.handleAdd();
+    }
+  }
+
+  // send pendingValKey as an argument in order to null out entered item
+  handleAdd() {
+    let options = this.props.options;
+    let value = this.props.value;
+    // if using a datalist (search), set value to be the key in options
+    if (this.props.useSearch && Object.values(options).indexOf(value) > -1) {
+      value = this.getKeyFromValue(value);
+    }
+    if (this.canAddItem(value)) {
+      this.props.onUserAdd(this.props.name, value, this.props.pendingValKey);
+    }
+  }
+
+  handleRemove(e) {
+    let value = e.target.getAttribute('data-item');
+    this.props.onUserRemove(this.props.name, value);
+  }
+
+  getKeyFromValue(value) {
+    let options = this.props.options;
+    return Object.keys(options).find(function(o) {
+      return options[o] === value;
+    });
+  }
+
+  // helper function to detect if item should be added to Tags
+  canAddItem(value) {
+    let result = true;
+    // reject empty values
+    if (!value) {
+      result = false;
+      // reject if allowDupl is false and item is already in array
+    } else if (!this.props.allowDupl && this.props.items.indexOf(value) > -1) {
+      result = false;
+      // reject if using a strict datalist and value is not in options
+    } else if (this.props.useSearch &&
+      this.props.strictSearch &&
+      Object.keys(this.props.options).indexOf(value) === -1
+    ) {
+      result = false;
+    }
+
+    return result;
+  }
+
+  render() {
+    let disabled = this.props.disabled ? 'disabled' : null;
+    let requiredHTML = null;
+    let emptyOptionHTML = null;
+    let errorMessage = null;
+    let elementClass = "row form-group";
+    // Add required asterix
+    if (this.props.required) {
+      requiredHTML = <span className="text-danger">*</span>;
+    }
+
+    // Add empty option
+    if (this.props.emptyOption) {
+      emptyOptionHTML = <option></option>;
+    }
+
+    if (this.props.errorMessage) {
+      errorMessage = <span>{this.props.errorMessage}</span>;
+      elementClass = 'row form-group has-error';
+    }
+
+    let input;
+    let options = this.props.options;
+    // if options are given and useSearch is specified
+    if (Object.keys(options).length > 0 && this.props.useSearch) {
+      input = (
+        <div>
+          <input
+            type="text"
+            name={this.props.name}
+            id={this.props.id}
+            list={this.props.id + '_list'}
+            className="form-control"
+            value={this.props.value || ""}
+            disabled={disabled}
+            onChange={this.handleChange}
+            onKeyPress={this.handleKeyPress}
+          />
+          <datalist id={this.props.id + '_list'}>
+            {Object.keys(options).map(function(option) {
+              return (
+                <option value={options[option]} key={option}>{options[option]}</option>
+              );
+            })}
+          </datalist>
+        </div>
+      );
+      // if options are present but useSearch is false, use normal dropdown
+    } else if (Object.keys(options).length > 0) {
+      input = <select
+        name={this.props.name}
+        className="form-control"
+        id={this.props.id}
+        value={this.props.value}
+        disabled={disabled}
+        onChange={this.handleChange}
+        onKeyPress={this.handleKeyPress}
+      >
+        {emptyOptionHTML}
+        {Object.keys(options).map(function(option) {
+          return (
+            <option value={option} key={option}>{options[option]}</option>
+          );
+        })}
+      </select>;
+      // else, use a text input by default
+    } else {
+      input = <input
+        type="text"
+        name={this.props.name}
+        id={this.props.id}
+        className="form-control"
+        value={this.props.value || ""}
+        disabled={disabled}
+        onChange={this.handleChange}
+        onKeyPress={this.handleKeyPress}
+      />;
+    }
+
+    // iterate through added Tags items and render them
+    // with deletion button
+    let items = this.props.items.map(function(item) {
+      let itmTxt;
+      // in event that the passed item is a key of options,
+      // render option value
+      if (Object.keys(options).length > 0 && options[item] !== undefined) {
+        itmTxt = options[item];
+        // otherwise just render item as is
+      } else {
+        itmTxt = item;
+      }
+      return (
+          <button
+            className="btn btn-info btn-inline"
+            type="button"
+            onClick={this.handleRemove}
+            data-item={item}
+          >
+            {itmTxt}
+            &nbsp;
+            <span
+              className="glyphicon glyphicon-remove"
+              data-item={item}
+            />
+          </button>
+      );
+    }, this);
+    return (
+      <div className={elementClass}>
+        <label className="col-sm-3 control-label" htmlFor={this.props.id}>
+          {this.props.label}
+          {requiredHTML}
+        </label>
+        <div className="col-sm-9">
+          {items}
+          {input}
+          {errorMessage}
+          <button
+            className="btn btn-success btn-add-tag"
+            id={this.props.id + 'Add'}
+            type="button"
+            onClick={this.handleAdd}
+            >
+            <span className="glyphicon glyphicon-plus"/>
+            {this.props.btnLabel}
+          </button>
+        </div>
+      </div>
+    );
+  }
+}
+
+TagsElement.propTypes = {
+  name: React.PropTypes.string.isRequired,
+  id: React.PropTypes.string.isRequired,
+  pendingValKey: React.PropTypes.string.isRequired,
+  options: React.PropTypes.object,
+  items: React.PropTypes.array,
+  label: React.PropTypes.string,
+  value: React.PropTypes.string,
+  class: React.PropTypes.string,
+  multiple: React.PropTypes.bool,
+  required: React.PropTypes.bool,
+  disabled: React.PropTypes.bool,
+  emptyOption: React.PropTypes.bool,
+  errorMessage: React.PropTypes.string,
+  btnLabel: React.PropTypes.string,
+  allowDupl: React.PropTypes.bool,
+  useSearch: React.PropTypes.bool,
+  strictSearch: React.PropTypes.bool,
+  onUserInput: React.PropTypes.func,
+  onUserAdd: React.PropTypes.func,
+  onUserRemove: React.PropTypes.func
+};
+
+TagsElement.defaultProps = {
+  name: '',
+  options: {},
+  items: [],
+  label: '',
+  value: undefined,
+  id: '',
+  class: '',
+  required: false,
+  disabled: false,
+  emptyOption: true,
+  hasError: false,
+  allowDupl: false,
+  useSearch: false,
+  strictSearch: false, // only accept items specified in options
+  errorMessage: '',
+  pendingValKey: '',
+  btnLabel: 'Add Tag',
+  onUserInput: function() {
+    console.warn('onUserInput() callback is not set');
+  },
+  onUserAdd: function() {
+    console.warn('onUserAdd() callback is not set');
+  },
+  onUserRemove: function() {
+    console.warn('onUserRemove() callback is not set');
+  }
+};
+
 /**
  * Textarea Component
  * React wrapper for a <textarea> element.
@@ -338,7 +759,9 @@ var TextboxElement = React.createClass({
     id: React.PropTypes.string,
     disabled: React.PropTypes.bool,
     required: React.PropTypes.bool,
-    onUserInput: React.PropTypes.func
+    errorMessage: React.PropTypes.string,
+    onUserInput: React.PropTypes.func,
+    onUserBlur: React.PropTypes.func
   },
   getDefaultProps: function() {
     return {
@@ -348,26 +771,40 @@ var TextboxElement = React.createClass({
       id: null,
       disabled: false,
       required: false,
+      errorMessage: '',
       onUserInput: function() {
         console.warn('onUserInput() callback is not set');
+      },
+      onUserBlur: function() {
       }
     };
   },
   handleChange: function(e) {
     this.props.onUserInput(this.props.name, e.target.value);
   },
+  handleBlur: function(e) {
+    this.props.onUserBlur(this.props.name, e.target.value);
+  },
   render: function() {
     var disabled = this.props.disabled ? 'disabled' : null;
     var required = this.props.required ? 'required' : null;
+    var errorMessage = null;
     var requiredHTML = null;
+    var elementClass = 'row form-group';
 
     // Add required asterix
     if (required) {
       requiredHTML = <span className="text-danger">*</span>;
     }
 
+    // Add error message
+    if (this.props.errorMessage) {
+      errorMessage = <span>{this.props.errorMessage}</span>;
+      elementClass = 'row form-group has-error';
+    }
+
     return (
-      <div className="row form-group">
+      <div className={elementClass}>
         <label className="col-sm-3 control-label" htmlFor={this.props.id}>
           {this.props.label}
           {requiredHTML}
@@ -382,7 +819,9 @@ var TextboxElement = React.createClass({
             required={required}
             disabled={disabled}
             onChange={this.handleChange}
+            onBlur={this.handleBlur}
           />
+          {errorMessage}
         </div>
       </div>
     );
@@ -400,6 +839,7 @@ var DateElement = React.createClass({
     label: React.PropTypes.string,
     value: React.PropTypes.string,
     id: React.PropTypes.string,
+    maxYear: React.PropTypes.string,
     disabled: React.PropTypes.bool,
     required: React.PropTypes.bool,
     onUserInput: React.PropTypes.func
@@ -411,6 +851,7 @@ var DateElement = React.createClass({
       label: '',
       value: '',
       id: null,
+      maxYear: '9999-12-31',
       disabled: false,
       required: false,
       onUserInput: function() {
@@ -442,7 +883,7 @@ var DateElement = React.createClass({
             type="date"
             className="form-control"
             name={this.props.name}
-            id={this.props.label}
+            id={this.props.id}
             min={this.props.minYear}
             max={this.props.maxYear}
             onChange={this.handleChange}
@@ -698,6 +1139,44 @@ var StaticElement = React.createClass({
   }
 });
 
+/**
+ * Link element component.
+ * Used to link plain/formated text to an href destination as part of a form
+ */
+var LinkElement = React.createClass({
+
+  mixins: [React.addons.PureRenderMixin],
+  propTypes: {
+    label: React.PropTypes.string,
+    text: React.PropTypes.oneOfType([
+      React.PropTypes.string,
+      React.PropTypes.element
+    ]),
+    href: React.PropTypes.string
+  },
+
+  getDefaultProps: function() {
+    return {
+      label: '',
+      text: null,
+      href: null
+    };
+  },
+
+  render: function() {
+    return (
+      <div className="row form-group">
+        <label className="col-sm-3 control-label">
+          {this.props.label}
+        </label>
+        <div className="col-sm-9">
+          <p className="form-control-static"><a href={this.props.href}>{this.props.text}</a></p>
+        </div>
+      </div>
+    );
+  }
+});
+
 /**
  * Button component
  * React wrapper for <button> element, typically used to submit forms
@@ -755,9 +1234,15 @@ var LorisElement = React.createClass({
       case 'text':
         elementHtml = (<TextboxElement {...elementProps} />);
         break;
+      case 'tags':
+        elementHtml = (<TagsElement {...elementProps} />);
+        break;
       case 'select':
         elementHtml = (<SelectElement {...elementProps} />);
         break;
+      case 'search':
+        elementHtml = (<SearchableDropdown {...elementProps}/>);
+        break;
       case 'date':
         elementHtml = (<DateElement {...elementProps} />);
         break;
@@ -773,6 +1258,9 @@ var LorisElement = React.createClass({
       case 'static':
         elementHtml = (<StaticElement {...elementProps} />);
         break;
+      case 'link':
+        elementHtml = (<LinkElement {...elementProps} />);
+        break;
       default:
         console.warn(
           "Element of type " + elementProps.type + " is not currently implemented!"
@@ -786,24 +1274,30 @@ var LorisElement = React.createClass({
 
 window.FormElement = FormElement;
 window.SelectElement = SelectElement;
+window.TagsElement = TagsElement;
+window.SearchableDropdown = SearchableDropdown;
 window.TextareaElement = TextareaElement;
 window.TextboxElement = TextboxElement;
 window.DateElement = DateElement;
 window.NumericElement = NumericElement;
 window.FileElement = FileElement;
 window.StaticElement = StaticElement;
+window.LinkElement = LinkElement;
 window.ButtonElement = ButtonElement;
 window.LorisElement = LorisElement;
 
 export default {
   FormElement,
   SelectElement,
+  TagsElement,
+  SearchableDropdown,
   TextareaElement,
   TextboxElement,
   DateElement,
   NumericElement,
   FileElement,
   StaticElement,
+  LinkElement,
   ButtonElement,
   LorisElement
 };
diff --git a/jsx/Markdown.js b/jsx/Markdown.js
index d3aecd2e181..6bea66e1ebd 100644
--- a/jsx/Markdown.js
+++ b/jsx/Markdown.js
@@ -18,16 +18,23 @@
  * @version 0.0.1
  *
  */
-var Markdown = React.createClass({
-  propTypes: {
-    content: React.PropTypes.string.isRequired
-  },
-  render: function() {
+class Markdown extends React.Component {
+
+  htmlSpecialCharsDecode(text) {
+    return text
+      .replace(/&amp;/g, "&")
+      .replace(/&quot;/g, "\"");
+  }
+
+  render() {
     // Fix stupid-style newlines to be just \n.
-    var fixedNewlines = this.props.content.replace("\r\n", "\n");
+    var fixedNewLines = this.props.content.replace(/\r\n/g, "\n");
+
+    // Fix excaped html
+    fixedNewLines = this.htmlSpecialCharsDecode(fixedNewLines);
 
     // 2 newlines in a row mean it's a paragraph breaker.
-    var paragraphs = fixedNewlines.split("\n\n");
+    var paragraphs = fixedNewLines.split("\n\n");
     var headersRe = /^(#+)\s+(.+)$/;
 
     // Do a non-greedy match on text surrounded by ** or __ separately,
@@ -35,27 +42,27 @@ var Markdown = React.createClass({
     // start and want the callback to reference the same index
     var boldRe1 = /(\*\*)(.+?)(\*\*)/g;
     var boldRe2 = /(__)(.+?)(__)/g;
-    var boldCallback = function(match, start, content, end, offset, val) {
+    function boldCallback(match, start, content, end, offset, val) {
       return "<b>" + content + "</b>";
-    };
+    }
 
     var italRe1 = /(\*)(.+?)(\*)/g;
     var italRe2 = /(_)(.+?)(_)/g;
-    var italCallback = function(match, start, content, end, offset, val) {
+    function italCallback(match, start, content, end, offset, val) {
       return "<i>" + content + "</i>";
-    };
+    }
 
     var linkRe = /\[(.+?)\]\((.+?)\)/g;
-    var linkCallback = function(match, text, link, offset, val) {
+    function linkCallback(match, text, link, offset, val) {
       return '<a href="' + link + '">' + text + '</a>';
-    };
+    }
     // This needs to be declared outside of the loop to keep eslint
     // happy. It's just the callback for the regex.
     var hlevel = 1;
-    var headerCallback = function(match, headerLevel, headerContent, offset, val) {
+    function headerCallback(match, headerLevel, headerContent, offset, val) {
       hlevel = headerLevel.length;
       return headerContent;
-    };
+    }
     for (let i = 0; i < paragraphs.length; i++) {
       // For now, assume that there's an empty line between
       // any headers. It's not true of strict markdown, but
@@ -106,7 +113,11 @@ var Markdown = React.createClass({
     }
     return <div>{paragraphs}</div>;
   }
-});
+}
+
+Markdown.propTypes = {
+  content: React.PropTypes.string.isRequired
+};
 
 var RMarkdown = React.createFactory(Markdown);
 
diff --git a/jsx/StaticDataTable.js b/jsx/StaticDataTable.js
index b41728e0aba..c5603dfeb3d 100644
--- a/jsx/StaticDataTable.js
+++ b/jsx/StaticDataTable.js
@@ -268,6 +268,9 @@ var StaticDataTable = React.createClass({
     let header = this.toCamelCase(headerData);
     let filterData = null;
     let exactMatch = false;
+    let result = false;
+    let searchKey = null;
+    let searchString = null;
 
     if (this.props.Filter[header]) {
       filterData = this.props.Filter[header].value;
@@ -282,22 +285,35 @@ var StaticDataTable = React.createClass({
     // Handle numeric inputs
     if (typeof filterData === 'number') {
       var intData = Number.parseInt(data, 10);
-      return filterData === intData;
+      result = (filterData === intData);
     }
 
     // Handle string inputs
     if (typeof filterData === 'string') {
-      var searchKey = filterData.toLowerCase();
-      var searchString = data.toLowerCase();
+      searchKey = filterData.toLowerCase();
+      searchString = data.toLowerCase();
 
       if (exactMatch) {
-        return searchString === searchKey;
+        result = (searchString === searchKey);
       }
 
-      return (searchString.indexOf(searchKey) > -1);
+      result = (searchString.indexOf(searchKey) > -1);
     }
 
-    return false;
+    // Handle array inputs for multiselects
+    if (typeof filterData === 'object') {
+      let match = false;
+      for (let i = 0; i < filterData.length; i += 1) {
+        searchKey = filterData[i].toLowerCase();
+        searchString = data.toLowerCase();
+
+        match = (searchString.indexOf(searchKey) > -1);
+        if (match) {
+          result = true;
+        }
+      }
+    }
+    return result;
   },
   render: function() {
     if (this.props.Data === null || this.props.Data.length === 0) {
diff --git a/jsx/Tabs.js b/jsx/Tabs.js
index 0d433f5b446..61643799e90 100644
--- a/jsx/Tabs.js
+++ b/jsx/Tabs.js
@@ -138,7 +138,128 @@ Tabs.propTypes = {
 };
 Tabs.defaultProps = {
   onTabChange: function() {},
-  updateURL: false
+  // Set updateURL to default to true but allow for change
+  // Nested tabs should set this variable to false
+  updateURL: true
+};
+
+/**
+ * Allows to dynamically render vertical tabs corresponding to tab panes.
+ */
+
+class VerticalTabs extends React.Component {
+  constructor(props) {
+    super(props);
+
+    const hash = window.location.hash;
+    let activeTab = "";
+
+    /**
+     * Determine the initial active tab in this order
+     * 1. Try to infer from the URL, otherwise
+     * 2. Try to infer from the defaultTab prop, otherwise
+     * 3. Set to be the first tab of the list
+     */
+    if (this.props.updateURL && hash) {
+      activeTab = hash.substr(1);
+    } else if (this.props.defaultTab) {
+      activeTab = this.props.defaultTab;
+    } else if (this.props.tabs.length > 0) {
+      activeTab = this.props.tabs[0].id;
+    }
+
+    this.state = {
+      activeTab: activeTab
+    };
+
+    this.handleClick = this.handleClick.bind(this);
+    this.getTabs = this.getTabs.bind(this);
+    this.getTabPanes = this.getTabPanes.bind(this);
+  }
+
+  handleClick(tabId, e) {
+    this.setState({activeTab: tabId});
+    this.props.onTabChange(tabId);
+
+    // Add tab href to URL querystring and scroll the page to top
+    if (this.props.updateURL) {
+      const scrollDistance = $('body').scrollTop() || $('html').scrollTop();
+      window.location.hash = e.target.hash;
+      $('html,body').scrollTop(scrollDistance);
+    }
+  }
+
+  getTabs() {
+    let tabs = (this.props.tabs).map(function(tab) {
+      let tabClass = this.state.activeTab === tab.id ? 'active' : null;
+      let href = "#" + tab.id;
+      let tabID = "tab-" + tab.id;
+      return (
+        <li
+          role="presentation"
+          className={tabClass}
+          key={tab.id}
+        >
+          <a id={tabID}
+             href={href}
+             role="tab"
+             data-toggle="tab"
+             onClick={this.handleClick.bind(null, tab.id)}
+          >
+            {tab.label}
+          </a>
+        </li>
+      );
+    }.bind(this));
+
+    return tabs;
+  }
+
+  getTabPanes() {
+    let tabPanes = React.Children.map(this.props.children, function(child, key) {
+      if (child) {
+        return React.cloneElement(child, {
+          activeTab: this.state.activeTab,
+          key: key
+        });
+      }
+    }.bind(this));
+
+    return tabPanes;
+  }
+
+  render() {
+    let tabs = this.getTabs();
+    let tabPanes = this.getTabPanes();
+    let tabStyle = {
+      marginLeft: 0,
+      marginBottom: '5px'
+    };
+
+    return (
+      <div>
+        <div className="tabbable col-md-3 col-sm-3">
+          <ul className="nav nav-pills nav-stacked" role="tablist" style={tabStyle}>
+            {tabs}
+          </ul>
+        </div>
+        <div className="tab-content col-md-9 col-sm-9">
+          {tabPanes}
+        </div>
+      </div>
+    );
+  }
+}
+VerticalTabs.propTypes = {
+  tabs: React.PropTypes.array.isRequired,
+  defaultTab: React.PropTypes.string,
+  updateURL: React.PropTypes.bool
+};
+VerticalTabs.defaultProps = {
+  onTabChange: function() {},
+  // Set updateURL to default to true but allow for change
+  // Nested tabs should set this variable to false
+  updateURL: true
 };
 
 /*
@@ -173,5 +294,6 @@ TabPane.propTypes = {
 
 export {
   Tabs,
+  VerticalTabs,
   TabPane
 };
diff --git a/modules/acknowledgements/README.md b/modules/acknowledgements/README.md
index 3b52ce566f7..786f2c9e72e 100644
--- a/modules/acknowledgements/README.md
+++ b/modules/acknowledgements/README.md
@@ -1 +1,51 @@
-The purpose of the Acknowledgement Generator is to aid in dynamically generating an appropriate list of people to acknowledge for any given publication.
+# Acknowledgements
+
+## Purpose
+
+The purpose of the Acknowledgements Generator is to aid in dynamically generating
+an appropriate list of people to acknowledge for any given publication.
+
+## Intended Users
+
+- Researchers who publish
+- Data coordinator who has knowledge of who collaborates on the project
+
+## Scope
+
+Example public facing link:
+
+`https://<YOUR-BASE-STUDY-URL>/acknowledgements/acknowledgements.php?date=2017-11-17`
+
+Given the publication date of `2017-11-17`, this will limit the list to people
+who started on or before `2017-11-17`.
+This list is intended to be used in any publication(s), so keep in mind it will
+be shared in the wild without authentication.
+
+## Permissions
+
+There are two permissions associated to the module:
+`acknowledgements_view` and `acknowledgements_edit`
+
+`acknowledgements_view` allows regular LORIS users to view the module within LORIS.
+
+`acknowledgements_edit` allows someone like the study coordinator to add members
+related to their project to the list.
+
+## Configurations
+
+Use the `citation_policy` config setting to specify any additional details which
+will be shown within the module.
+
+Things like affiliations, degrees, and roles can be customized in the template
+by a developer.
+
+The code for the public side of things can be found within:
+`htdocs/acknowledgements/acknowledgements.php`
+
+The code can easily be customized to add more complex filtering as needed.
+
+## Interactions with LORIS
+
+Could be linked to the Data Release as a future feature.
+
+Another future implementation: DOIs
diff --git a/modules/acknowledgements/js/columnFormatter.js b/modules/acknowledgements/js/columnFormatter.js
new file mode 100644
index 00000000000..48f9c0d7244
--- /dev/null
+++ b/modules/acknowledgements/js/columnFormatter.js
@@ -0,0 +1,2 @@
+!function(modules){function __webpack_require__(moduleId){if(installedModules[moduleId])return installedModules[moduleId].exports;var module=installedModules[moduleId]={exports:{},id:moduleId,loaded:!1};return modules[moduleId].call(module.exports,module,module.exports,__webpack_require__),module.loaded=!0,module.exports}var installedModules={};return __webpack_require__.m=modules,__webpack_require__.c=installedModules,__webpack_require__.p="",__webpack_require__(0)}([function(module,exports){"use strict";function formatAcknowledgementsColumn(column,cell,rowData,rowHeaders){return React.createElement("td",null,cell)}window.formatAcknowledgementsColumn=formatAcknowledgementsColumn}]);
+//# sourceMappingURL=columnFormatter.js.map
\ No newline at end of file
diff --git a/modules/acknowledgements/jsx/columnFormatter.js b/modules/acknowledgements/jsx/columnFormatter.js
new file mode 100644
index 00000000000..c7779cec5c5
--- /dev/null
+++ b/modules/acknowledgements/jsx/columnFormatter.js
@@ -0,0 +1,16 @@
+/* exported formatAcknowledgementsColumn */
+
+/**
+ * Modify behaviour of specified column cells in the Data Table component
+ * @param {string} column - column name
+ * @param {string} cell - cell content
+ * @param {arrray} rowData - array of cell contents for a specific row
+ * @param {arrray} rowHeaders - array of headers for the table
+ * @return {*} a formated table cell for a given column
+ */
+function formatAcknowledgementsColumn(column, cell, rowData, rowHeaders) {
+  return <td>{cell}</td>;
+}
+
+window.formatAcknowledgementsColumn = formatAcknowledgementsColumn;
+
diff --git a/modules/acknowledgements/php/acknowledgements.class.inc b/modules/acknowledgements/php/acknowledgements.class.inc
index cefc0cdad93..2444203f2bc 100644
--- a/modules/acknowledgements/php/acknowledgements.class.inc
+++ b/modules/acknowledgements/php/acknowledgements.class.inc
@@ -101,7 +101,7 @@ class Acknowledgements extends \NDB_Menu_Filter_Form
      * Sets up all the class variables needed for the
      * acknowledgements menu filter
      *
-     * @return true on success
+     * @return void
      */
     function _setupVariables()
     {
@@ -148,8 +148,6 @@ class Acknowledgements extends \NDB_Menu_Filter_Form
                               );
 
         $this->tpl_data['citation_policy'] = $config->getSetting('citation_policy');
-
-        return true;
     }
 
     /**
@@ -157,7 +155,7 @@ class Acknowledgements extends \NDB_Menu_Filter_Form
      * that are common to every type of page. May be overridden by a specific
      * page or specific page type.
      *
-     * @return none
+     * @return void
      */
     function setup()
     {
@@ -205,8 +203,6 @@ class Acknowledgements extends \NDB_Menu_Filter_Form
         $this->addBasicDate('addstart_date', 'Start Date:', $dateOptions);
         $this->addBasicDate('addend_date', 'End Date:', $dateOptions);
         $this->addSelect('addpresent', 'Present?', $present);
-
-        return true;
     }
 
     /**
@@ -225,6 +221,7 @@ class Acknowledgements extends \NDB_Menu_Filter_Form
             $baseDeps,
             array(
              $baseurl . '/acknowledgements/js/acknowledgements_helper.js',
+             $baseurl . '/acknowledgements/js/columnFormatter.js',
             )
         );
 
diff --git a/modules/acknowledgements/templates/menu_acknowledgements.tpl b/modules/acknowledgements/templates/menu_acknowledgements.tpl
index 7af64edb67a..aac79c57f05 100644
--- a/modules/acknowledgements/templates/menu_acknowledgements.tpl
+++ b/modules/acknowledgements/templates/menu_acknowledgements.tpl
@@ -187,39 +187,20 @@
                                     <input class="btn btn-sm btn-primary" value="Reset" type="reset" />
                                 </td>
                             </tr>
-                            {section name=item loop=$items}
-                            <tr>
-                                {section name=piece loop=$items[item]}
-                                    {if $items[item][piece].name != ""}
-                                        <td>
-                                            {if $items[item][piece].value == "bachelors"}
-                                                Bachelors
-                                            {elseif $items[item][piece].value == "masters"}
-                                                Masters
-                                            {elseif $items[item][piece].value == "phd"}
-                                                PhD
-                                            {elseif $items[item][piece].value == "postdoc"}
-                                                Postdoctoral
-                                            {elseif $items[item][piece].value == "md"}
-                                                MD
-                                            {elseif $items[item][piece].value == "registered_nurse"}
-                                                Registered Nurse
-                                            {else}
-                                                {$items[item][piece].value}
-                                            {/if}
-                                        </td>
-                                    {/if}
-                                {/section}
-                            </tr>
-                            {sectionelse}
-                                <tr>
-                                    <tr><td colspan="10">You're not alone.</td></tr>
-                                </tr>
-                            {/section}
                         </tbody>
                     </table>
                 </form>
             </div>
         </div>
+         <br>
+         <div id="datatable" />
     </div>
 </div>
+<script>
+var table = RDynamicDataTable({
+    "DataURL" : "{$baseurl}/acknowledgements/?format=json",
+    "getFormattedCell" : formatAcknowledgementsColumn
+
+});
+ReactDOM.render(table, document.getElementById("datatable"));
+</script>
diff --git a/modules/brainbrowser/README.md b/modules/brainbrowser/README.md
new file mode 100644
index 00000000000..27fb43c45bc
--- /dev/null
+++ b/modules/brainbrowser/README.md
@@ -0,0 +1,42 @@
+# Brainbrowser
+
+## Purpose
+
+Brainbrowser allows visualization and navigation of the MINC images of a 
+candidate's imaging session.
+
+
+## Intended Users
+
+The two primary types of users are:
+- Imaging specialists doing online quality control (QC)
+- Project radiologists reporting incidental findings.
+
+
+## Scope
+
+Brainbrowser allows visualization of MINC images directly within its browser.
+The user can navigate those images with sagittal, coronal, and transverse 
+slices displayed.  In addition, a `Play` button is available to make feasible 
+the navigation through a 4-Dimensional image (such as time in the case of 
+resting state fMRI scans, and directions in the case of DWI scans). 
+Multiple volumes can be displayed simultaneously with the possibility to 
+synchronize the coordinates across the different volumes when moving the cursor 
+across any one of them. 
+Image brightness and intensity can be adjusted by the user.
+Finally, a measurement tool is also available allowing radiologists to report 
+measurements on an incidental finding.
+
+
+## Permissions
+
+Since Brainbrowser is accessible from the Imaging Browser, its permissions are 
+directly linked to those of the Imaging Browser module. Please consult the 
+Imaging Browser 
+[Permissions](../imaging_browser/README.md#imaging_browser_perm_link) 
+for access details.
+
+## Configurations
+
+For Brainbrowser to load the MINC images successfully, the `config.xml` option 
+`MINCToolsPath` should point to the path where the MINC toolkit is installed.
\ No newline at end of file
diff --git a/modules/candidate_list/php/candidate_list.class.inc b/modules/candidate_list/php/candidate_list.class.inc
index 2921dea2fbd..7283a56fccf 100644
--- a/modules/candidate_list/php/candidate_list.class.inc
+++ b/modules/candidate_list/php/candidate_list.class.inc
@@ -46,7 +46,7 @@ class Candidate_List extends \NDB_Menu_Filter
      * Sets up all the class variables needed for the candidate_list menu
      * filter
      *
-     * @return true on success
+     * @return void
      */
     function _setupVariables()
     {
@@ -198,7 +198,7 @@ class Candidate_List extends \NDB_Menu_Filter
     /**
      * Create the form for the candidate_list menu page
      *
-     * @return none
+     * @return void
      */
     function setup()
     {
diff --git a/modules/candidate_parameters/README.md b/modules/candidate_parameters/README.md
new file mode 100644
index 00000000000..e850ea55a6f
--- /dev/null
+++ b/modules/candidate_parameters/README.md
@@ -0,0 +1,75 @@
+# Candidate Parameters
+
+## Purpose
+
+The Candidate Parameters module allows users to input 
+candidate data that is not timepoint specific.
+
+## Intended Users
+
+The primary types of users are:
+1. Data entry personnel
+2. Site coordinators who are validating the data
+
+## Scope
+
+The Candidate Parameters module stores all information 
+for a candidate that is not timepoint dependent. All data 
+collected during a visit should be entered as an instrument 
+at the visit level.
+
+## Permissions
+
+The Candidate Parameters module uses the following permissions. Either one
+is sufficient to access the module.
+
+ - `candidate_parameter_view`
+    - This permission gives the user access to view the module and all of its tabs.
+
+ - `candidate_parameter_edit`
+    - This permission gives the user access to edit the module and all of its tabs.
+
+## Configurations
+
+The following configurations affect the usage of the Candidate Parameters module:
+
+ - `useProband` 
+    - This setting displays/hides the _Proband_ tab of the module.
+
+ - `useFamilyID`
+    - This setting displays/hides the _Family_ tab of the module.
+
+ - `useConsent`
+    - This setting displays/hides the _Consent Status_ tab of the module.
+
+The _Consent Status_ tab dynamically displays consents defined under the 
+`<ConsentModule> <Consent>` tags in the config.xml file (see [setup.md](setup.md) for an example).
+
+ - The `<name> </name>` tag defines the field name on the form and is required to 
+ match the name of the sql fields in the `participant_status` and 
+ `consent_info_history` tables of the database. 
+ - The `<label> </label>` tag defines the front-end label displayed in the candidate 
+ parameters module for the consent in question. 
+ 
+The _Candidate Information_ tab dynamically displays customized fields configured in 
+the database. The following SQL tables affect the behaviour of these fields:
+
+ - `parameter_type_category`
+    - Identifies the categories for `parameter_type` entries. This table requires an 
+    entry for the _Candidate Parameters_ module for customizations to take effect.
+ - `parameter_type`
+    - Lists fields, and all of their attributes, that are to be displayed on the 
+    front-end of the module.
+ - `parameter_type_category_rel`
+    - Associates the Candidate Parameters from the `parameter_type` 
+    table with the entry in the `parameter_type_category`.
+ - `parameter_candidate`
+    - Stores values saved for each custom field added in the 3 tables above.
+
+## Interactions with LORIS
+
+- Information collected in this modules is exported to the Data Query Tool (DQT) 
+using the `CouchDB_Import_Demographics.php` tool script. Any modifications or additions 
+to this module should be manually added to the script in order to be included 
+in the DQT Demographics table. Alternatively, these modifications or additions can be 
+added to a separate script that is then exported to the DQT.
diff --git a/modules/candidate_parameters/js/index.js b/modules/candidate_parameters/js/index.js
index 5ddd35ac9e8..d78b13793dc 100644
--- a/modules/candidate_parameters/js/index.js
+++ b/modules/candidate_parameters/js/index.js
@@ -1,3 +1,3 @@
-!function(modules){function __webpack_require__(moduleId){if(installedModules[moduleId])return installedModules[moduleId].exports;var module=installedModules[moduleId]={exports:{},id:moduleId,loaded:!1};return modules[moduleId].call(module.exports,module,module.exports,__webpack_require__),module.loaded=!0,module.exports}var installedModules={};return __webpack_require__.m=modules,__webpack_require__.c=installedModules,__webpack_require__.p="",__webpack_require__(0)}([function(module,exports,__webpack_require__){"use strict";function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}var _CandidateParameters=__webpack_require__(3),_CandidateParameters2=_interopRequireDefault(_CandidateParameters),args=QueryString.get(document.currentScript.src);$(function(){var candidateParameters=React.createElement("div",{className:"page-candidate-parameters"},React.createElement(_CandidateParameters2.default,{Module:"candidate_parameters",candID:args.candID}));ReactDOM.render(candidateParameters,document.getElementById("lorisworkspace"))})},,,function(module,exports,__webpack_require__){"use strict";function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}Object.defineProperty(exports,"__esModule",{value:!0});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),_CandidateInfo=__webpack_require__(4),_CandidateInfo2=_interopRequireDefault(_CandidateInfo),_ProbandInfo=__webpack_require__(5),_ProbandInfo2=_interopRequireDefault(_ProbandInfo),_FamilyInfo=__webpack_require__(6),_FamilyInfo2=_interopRequireDefault(_FamilyInfo),_ParticipantStatus=__webpack_require__(7),_ParticipantStatus2=_interopRequireDefault(_ParticipantStatus),_ConsentStatus=__webpack_require__(8),_ConsentStatus2=_interopRequireDefault(_ConsentStatus),_Tabs=__webpack_require__(9),CandidateParameters=function(_React$Component){function CandidateParameters(){return _classCallCheck(this,CandidateParameters),_possibleConstructorReturn(this,(CandidateParameters.__proto__||Object.getPrototypeOf(CandidateParameters)).apply(this,arguments))}return _inherits(CandidateParameters,_React$Component),_createClass(CandidateParameters,[{key:"getTabPanes",value:function(tabList){var actionURL=loris.BaseURL+"/candidate_parameters/ajax/formHandler.php",dataURL=loris.BaseURL+"/candidate_parameters/ajax/getData.php?candID="+this.props.candID,tabPanes=Object.keys(tabList).map(function(key){var TabContent=tabList[key].component;return React.createElement(_Tabs.TabPane,{TabId:tabList[key].id,key:key},React.createElement(TabContent,{action:actionURL,dataURL:dataURL+"&data="+tabList[key].id,tabName:tabList[key].id}))});return tabPanes}},{key:"render",value:function(){var tabList=[{id:"candidateInfo",label:"Candidate Information",component:_CandidateInfo2.default},{id:"participantStatus",label:"Participant Status",component:_ParticipantStatus2.default}];return"true"===loris.config("useProband")&&tabList.push({id:"probandInfo",label:"Proband Information",component:_ProbandInfo2.default}),"true"===loris.config("useFamilyID")&&tabList.push({id:"familyInfo",label:"Family Information",component:_FamilyInfo2.default}),"true"===loris.config("useConsent")&&tabList.push({id:"consentStatus",label:"Consent Status",component:_ConsentStatus2.default}),React.createElement("div",null,React.createElement("a",{className:"btn btn-sm btn-primary",href:loris.BaseURL+"/timepoint_list/?candID="+this.props.candID,style:{marginBottom:"20px"}},"Return to timepoint list"),React.createElement("br",null),React.createElement(_Tabs.Tabs,{tabs:tabList,defaultTab:"candidateInfo",updateURL:!0},this.getTabPanes(tabList)))}}]),CandidateParameters}(React.Component);CandidateParameters.propTypes={},CandidateParameters.defaultProps={},exports.default=CandidateParameters},function(module,exports){"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var CandidateInfo=React.createClass({displayName:"CandidateInfo",getInitialState:function(){return{caveatOptions:{true:"True",false:"False"},Data:[],formData:{},updateResult:null,errorMessage:null,isLoaded:!1,loadedData:0}},componentDidMount:function(){var that=this;$.ajax(this.props.dataURL,{dataType:"json",success:function(data){var formData={flaggedCaveatemptor:data.flagged_caveatemptor,flaggedOther:data.flagged_other,flaggedReason:data.flagged_reason};Object.assign(formData,data.parameter_values),that.setState({Data:data,isLoaded:!0,formData:formData})},error:function(data,errorCode,errorMsg){that.setState({error:"An error occurred when loading the form!"})}})},setFormData:function(formElement,value){var formData=JSON.parse(JSON.stringify(this.state.formData));formData[formElement]=value,"flaggedCaveatemptor"===formElement&&"false"===value&&(formData.flaggedReason="",formData.flaggedOther=""),"flaggedReason"===formElement&&"Other"!==this.state.Data.caveatReasonOptions[value]&&(formData.flaggedOther=""),this.setState({formData:formData})},onSubmit:function(e){e.preventDefault()},render:function(){if(!this.state.isLoaded)return void 0!==this.state.error?React.createElement("div",{className:"alert alert-danger text-center"},React.createElement("strong",null,this.state.error)):React.createElement("button",{className:"btn-info has-spinner"},"Loading",React.createElement("span",{className:"glyphicon glyphicon-refresh glyphicon-refresh-animate"}));var disabled=!0,updateButton=null;loris.userHasPermission("candidate_parameter_edit")&&(disabled=!1,updateButton=React.createElement(ButtonElement,{label:"Update"}));var reasonDisabled=!0,reasonRequired=!1;"true"===this.state.formData.flaggedCaveatemptor&&(reasonDisabled=!1,reasonRequired=!0);var reasonKey=null,specifyOther=null,otherDisabled=!0,otherRequired=!1;for(var key in this.state.Data.caveatReasonOptions)if(this.state.Data.caveatReasonOptions.hasOwnProperty(key)&&"Other"===this.state.Data.caveatReasonOptions[key]){reasonKey=key;break}this.state.formData.flaggedReason===reasonKey&&(otherRequired=!0,otherDisabled=!1),"false"===this.state.formData.flaggedCaveatemptor&&(reasonDisabled=!0,reasonRequired=!1,otherDisabled=!0,otherRequired=!1),null!==reasonKey&&(specifyOther=React.createElement(TextareaElement,{label:"If Other, please specify",name:"flaggedOther",value:this.state.formData.flaggedOther,onUserInput:this.setFormData,ref:"flaggedOther",disabled:otherDisabled,required:otherRequired}));var extraParameterFields=[],extraParameters=this.state.Data.extra_parameters;for(var key2 in extraParameters)if(extraParameters.hasOwnProperty(key2)){var paramTypeID=extraParameters[key2].ParameterTypeID,name=paramTypeID,value=this.state.formData[paramTypeID];switch(extraParameters[key2].Type.substring(0,3)){case"enu":var types=extraParameters[key2].Type.substring(5);types=types.slice(0,-1),types=types.replace(/'/g,""),types=types.split(",");var selectOptions={};for(var key3 in types)types.hasOwnProperty(key3)&&(selectOptions[types[key3]]=types[key3]);extraParameterFields.push(React.createElement(SelectElement,{label:extraParameters[key2].Description,name:name,options:selectOptions,value:value,onUserInput:this.setFormData,ref:name,disabled:disabled,key:key2}));break;case"dat":extraParameterFields.push(React.createElement(DateElement,{label:extraParameters[key2].Description,name:name,value:value,onUserInput:this.setFormData,ref:name,disabled:disabled,key:key2}));break;default:extraParameterFields.push(React.createElement(TextareaElement,{label:extraParameters[key2].Description,name:name,value:value,onUserInput:this.setFormData,ref:name,disabled:disabled,key:key2}))}}var alertMessage="",alertClass="alert text-center hide";if(this.state.updateResult)if("success"===this.state.updateResult)alertClass="alert alert-success text-center",alertMessage="Update Successful!";else if("error"===this.state.updateResult){var errorMessage=this.state.errorMessage;alertClass="alert alert-danger text-center",alertMessage=errorMessage?errorMessage:"Failed to update!"}return React.createElement("div",{className:"row"},React.createElement("div",{className:alertClass,role:"alert",ref:"alert-message"},alertMessage),React.createElement(FormElement,{name:"candidateInfo",onSubmit:this.handleSubmit,ref:"form",class:"col-md-6"},React.createElement(StaticElement,{label:"PSCID",text:this.state.Data.pscid}),React.createElement(StaticElement,{label:"DCCID",text:this.state.Data.candID}),React.createElement(SelectElement,{label:"Caveat Emptor Flag for Candidate",name:"flaggedCaveatemptor",options:this.state.caveatOptions,value:this.state.formData.flaggedCaveatemptor,onUserInput:this.setFormData,ref:"flaggedCaveatemptor",disabled:disabled,required:!0}),React.createElement(SelectElement,{label:"Reason for Caveat Emptor Flag",name:"flaggedReason",options:this.state.Data.caveatReasonOptions,value:this.state.formData.flaggedReason,onUserInput:this.setFormData,ref:"flaggedReason",disabled:reasonDisabled,required:reasonRequired}),specifyOther,extraParameterFields,updateButton))},handleSubmit:function(e){e.preventDefault();var myFormData=this.state.formData,self=this,formData=new FormData;for(var key in myFormData)myFormData.hasOwnProperty(key)&&""!==myFormData[key]&&formData.append(key,myFormData[key]);formData.append("tab",this.props.tabName),formData.append("candID",this.state.Data.candID),$.ajax({type:"POST",url:self.props.action,data:formData,cache:!1,contentType:!1,processData:!1,success:function(data){self.setState({updateResult:"success"}),self.showAlertMessage()},error:function(err){if(""!==err.responseText){var errorMessage=JSON.parse(err.responseText).message;self.setState({updateResult:"error",errorMessage:errorMessage}),self.showAlertMessage()}}})},showAlertMessage:function(){var self=this;if(null!==this.refs["alert-message"]){var alertMsg=this.refs["alert-message"];$(alertMsg).fadeTo(2e3,500).delay(3e3).slideUp(500,function(){self.setState({updateResult:null})})}}});exports.default=CandidateInfo},function(module,exports){"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var ProbandInfo=React.createClass({displayName:"ProbandInfo",getInitialState:function(){return{genderOptions:{Male:"Male",Female:"Female"},Data:[],formData:{},updateResult:null,errorMessage:null,isLoaded:!1,loadedData:0}},componentDidMount:function(){var that=this;$.ajax(this.props.dataURL,{dataType:"json",success:function(data){var formData={ProbandGender:data.ProbandGender,ProbandDoB:data.ProbandDoB,ProbandDoB2:data.ProbandDoB};that.setState({formData:formData,Data:data,isLoaded:!0})},error:function(data,errorCode,errorMsg){that.setState({error:"An error occurred when loading the form!"})}})},setFormData:function(formElement,value){var formData=this.state.formData;formData[formElement]=value,this.setState({formData:formData})},onSubmit:function(e){e.preventDefault()},render:function(){var _this=this;if(!this.state.isLoaded)return void 0!==this.state.error?React.createElement("div",{className:"alert alert-danger text-center"},React.createElement("strong",null,this.state.error)):React.createElement("button",{className:"btn-info has-spinner"},"Loading",React.createElement("span",{className:"glyphicon glyphicon-refresh glyphicon-refresh-animate"}));var disabled=!0,updateButton=null;loris.userHasPermission("candidate_parameter_edit")&&(disabled=!1,updateButton=React.createElement(ButtonElement,{label:"Update"}));var dobRequired=!1,dob2Required=!1;null!==this.state.formData.ProbandGender&&(dobRequired=!0),null!==this.state.formData.ProbandDoB&&(dob2Required=!0);var extraParameters=this.state.Data.extra_parameters,extraParameterFields=extraParameters.map(function(extraParam){var paramTypeID=extraParam.ParameterTypeID,name="PTID"+paramTypeID,value=_this.state.Data.parameter_values[paramTypeID];switch(extraParam.Type.substring(0,3)){case"enu":var types=extraParam.Type.substring(5);types=types.slice(0,-1),types=types.replace(/'/g,""),types=types.split(",");var selectOptions={};return types.forEach(function(type){selectOptions[type]=type}),React.createElement(SelectElement,{label:extraParam.Description,name:name,options:selectOptions,value:value,onUserInput:_this.setFormData,ref:name,disabled:disabled});case"dat":return React.createElement(DateElement,{label:extraParam.Description,name:name,value:value,onUserInput:_this.setFormData,ref:name,disabled:disabled});default:return React.createElement(TextareaElement,{label:extraParam.Description,name:name,value:value,onUserInput:_this.setFormData,ref:name,disabled:disabled})}}),alertMessage="",alertClass="alert text-center hide";if(this.state.updateResult)if("success"===this.state.updateResult)alertClass="alert alert-success text-center",alertMessage="Update Successful!";else if("error"===this.state.updateResult){var errorMessage=this.state.errorMessage;alertClass="alert alert-danger text-center",alertMessage=errorMessage?errorMessage:"Failed to update!"}return React.createElement("div",{className:"row"},React.createElement("div",{className:alertClass,role:"alert",ref:"alert-message"},alertMessage),React.createElement(FormElement,{name:"probandInfo",onSubmit:this.handleSubmit,ref:"form",class:"col-md-6"},React.createElement(StaticElement,{label:"PSCID",text:this.state.Data.pscid}),React.createElement(StaticElement,{label:"DCCID",text:this.state.Data.candID}),React.createElement(SelectElement,{label:"Proband Gender",name:"ProbandGender",options:this.state.genderOptions,value:this.state.formData.ProbandGender,onUserInput:this.setFormData,ref:"ProbandGender",disabled:disabled,required:!0}),React.createElement(DateElement,{label:"DoB Proband",name:"ProbandDoB",value:this.state.formData.ProbandDoB,onUserInput:this.setFormData,ref:"ProbandDoB",disabled:disabled,required:dobRequired}),React.createElement(DateElement,{label:"Confirm DoB Proband",name:"ProbandDoB2",value:this.state.formData.ProbandDoB2,onUserInput:this.setFormData,ref:"ProbandDoB2",disabled:disabled,required:dob2Required}),React.createElement(StaticElement,{label:"Age Difference (months)",text:this.state.Data.ageDifference.toString()}),extraParameterFields,updateButton))},handleSubmit:function(e){e.preventDefault();var myFormData=this.state.formData,today=new Date,dd=today.getDate(),mm=today.getMonth()+1,yyyy=today.getFullYear();dd<10&&(dd="0"+dd),mm<10&&(mm="0"+mm),today=yyyy+"-"+mm+"-"+dd;var dob1=myFormData.ProbandDoB?myFormData.ProbandDoB:null,dob2=myFormData.ProbandDoB2?myFormData.ProbandDoB2:null;if(dob1!==dob2)return void alert("DOB do not match!");if(dob1>today)return void alert("Consent to study date cannot be later than today!");var self=this,formData=new FormData;for(var key in myFormData)""!==myFormData[key]&&formData.append(key,myFormData[key]);formData.append("tab",this.props.tabName),formData.append("candID",this.state.Data.candID),$.ajax({type:"POST",url:self.props.action,data:formData,cache:!1,contentType:!1,processData:!1,success:function(data){self.setState({updateResult:"success"}),self.showAlertMessage()},error:function(err){if(""!==err.responseText){var errorMessage=JSON.parse(err.responseText).message;self.setState({updateResult:"error",errorMessage:errorMessage}),self.showAlertMessage()}}})},showAlertMessage:function(){var self=this;if(null!==this.refs["alert-message"]){var alertMsg=this.refs["alert-message"];$(alertMsg).fadeTo(2e3,500).delay(3e3).slideUp(500,function(){self.setState({updateResult:null})})}}});exports.default=ProbandInfo},function(module,exports){"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var FamilyInfo=React.createClass({displayName:"FamilyInfo",getInitialState:function(){return{Data:[],formData:{},familyMembers:[],updateResult:null,errorMessage:null,isLoaded:!1,loadedData:0}},componentDidMount:function(){var that=this;$.ajax(this.props.dataURL,{dataType:"json",xhr:function xhr(){var xhr=new window.XMLHttpRequest;return xhr.addEventListener("progress",function(evt){that.setState({loadedData:evt.loaded})}),xhr},success:function(data){that.setState({Data:data,isLoaded:!0,familyMembers:data.existingFamilyMembers})},error:function(data,errorCode,errorMsg){that.setState({error:"An error occurred when loading the form!"})}})},setFormData:function(formElement,value){var formData=this.state.formData;formData[formElement]=value,this.setState({formData:formData})},onSubmit:function(e){e.preventDefault()},render:function(){if(!this.state.isLoaded)return void 0!==this.state.error?React.createElement("div",{className:"alert alert-danger text-center"},React.createElement("strong",null,this.state.error)):React.createElement("button",{className:"btn-info has-spinner"},"Loading",React.createElement("span",{className:"glyphicon glyphicon-refresh glyphicon-refresh-animate"}));var relationshipOptions={full_sibling:"Full Sibling",half_sibling:"Half Sibling","1st_cousin":"First Cousin"},disabled=!0,addButton=null;loris.userHasPermission("candidate_parameter_edit")&&(disabled=!1,addButton=React.createElement(ButtonElement,{label:"Add"}));var candidateList=this.state.Data.candidates,familyMembers=this.state.familyMembers,familyMembersHTML=[];for(var key in familyMembers)if(familyMembers.hasOwnProperty(key)){var candID=familyMembers[key].FamilyCandID,relationship=familyMembers[key].Relationship_type,link="?candID="+candID+"&identifier="+candID;familyMembersHTML.push(React.createElement("div",{key:key},React.createElement(StaticElement,{label:"Family Member DCCID",text:React.createElement("a",{href:link},candID)}),React.createElement(StaticElement,{label:"Relation Type",text:relationshipOptions[relationship]}),React.createElement(ButtonElement,{label:"Delete",type:"button",onUserInput:this.deleteFamilyMember.bind(null,candID,key,candidateList)}),React.createElement("hr",null))),delete candidateList[candID]}var alertMessage="",alertClass="alert text-center hide";if(this.state.updateResult)if("success"===this.state.updateResult)alertClass="alert alert-success text-center",alertMessage="Update Successful!";else if("error"===this.state.updateResult){var errorMessage=this.state.errorMessage;alertClass="alert alert-danger text-center",alertMessage=errorMessage?errorMessage:"Failed to update!"}return React.createElement("div",{className:"row"},React.createElement("div",{className:alertClass,role:"alert",ref:"alert-message"},alertMessage),React.createElement(FormElement,{name:"familyInfo",onSubmit:this.handleSubmit,ref:"form",class:"col-md-6"},React.createElement(StaticElement,{label:"PSCID",text:this.state.Data.pscid}),React.createElement(StaticElement,{label:"DCCID",text:this.state.Data.candID}),React.createElement("hr",null),familyMembersHTML,React.createElement(SelectElement,{label:"Family Member ID (DCCID)",name:"FamilyCandID",options:candidateList,onUserInput:this.setFormData,ref:"FamilyCandID",disabled:disabled,required:!0,value:this.state.formData.FamilyCandID}),React.createElement(SelectElement,{label:"Relation Type",name:"Relationship_type",options:relationshipOptions,onUserInput:this.setFormData,ref:"Relationship_type",disabled:disabled,required:!0,value:this.state.formData.Relationship_type}),addButton))},handleSubmit:function(e){e.preventDefault();var myFormData=this.state.formData,self=this,formData=new FormData,formRefs=this.refs,familyMembers=this.state.familyMembers,familyMember={};for(var key in myFormData)myFormData.hasOwnProperty(key)&&""!==myFormData[key]&&(familyMember[key]=myFormData[key],formData.append(key,myFormData[key]));formData.append("tab",this.props.tabName),formData.append("candID",this.state.Data.candID),familyMembers.push(familyMember),this.setState({familyMembers:familyMembers}),$.ajax({type:"POST",url:self.props.action,data:formData,cache:!1,contentType:!1,processData:!1,success:function(data){self.setState({updateResult:"success",formData:{}}),self.showAlertMessage(),Object.keys(formRefs).map(function(ref){formRefs[ref].state&&formRefs[ref].state.value&&(formRefs[ref].state.value="")}),self.forceUpdate()},error:function(err){var errorMessage=JSON.parse(err.responseText).message;self.setState({updateResult:"error",errorMessage:errorMessage}),self.showAlertMessage()}})},showAlertMessage:function(){var self=this;if(null!==this.refs["alert-message"]){var alertMsg=this.refs["alert-message"];$(alertMsg).fadeTo(2e3,500).delay(3e3).slideUp(500,function(){self.setState({updateResult:null})})}},deleteFamilyMember:function(candID,key,candidateList){var familyMembers=this.state.familyMembers;delete familyMembers[key],candidateList[candID]=candID,this.setState({familyMembers:familyMembers});var myFormData=this.state.formData,self=this,formData=new FormData;for(var _key in myFormData)myFormData.hasOwnProperty(_key)&&""!==myFormData[_key]&&formData.append(_key,myFormData[_key]);formData.append("tab","deleteFamilyMember"),formData.append("candID",this.state.Data.candID),formData.append("familyDCCID",candID),$.ajax({type:"POST",url:self.props.action,data:formData,cache:!1,contentType:!1,processData:!1,success:function(data){self.setState({updateResult:"success"}),self.showAlertMessage()},error:function(err){if(""!==err.responseText){var errorMessage=JSON.parse(err.responseText).message;self.setState({updateResult:"error",errorMessage:errorMessage}),self.showAlertMessage()}}})}});exports.default=FamilyInfo},function(module,exports){"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var ParticipantStatus=React.createClass({displayName:"ParticipantStatus",getInitialState:function(){return{Data:[],formData:{},updateResult:null,errorMessage:null,isLoaded:!1,loadedData:0}},componentDidMount:function(){var that=this;$.ajax(this.props.dataURL,{dataType:"json",xhr:function xhr(){var xhr=new window.XMLHttpRequest;return xhr.addEventListener("progress",function(evt){that.setState({loadedData:evt.loaded})}),xhr},success:function(data){var formData={};formData.participantStatus=data.participantStatus,formData.participantSuboptions=data.participantSuboptions,formData.reasonSpecify=data.reasonSpecify,that.setState({Data:data,formData:formData,isLoaded:!0})},error:function(data,errorCode,errorMsg){that.setState({error:"An error occurred when loading the form!"})}})},setFormData:function(formElement,value){var formData=this.state.formData,required=this.state.Data.required;"participantStatus"===formElement&&required.indexOf(value)<0&&(formData.participantSuboptions=""),formData[formElement]=value,this.setState({formData:formData})},onSubmit:function(e){e.preventDefault()},render:function(){if(!this.state.isLoaded)return void 0!==this.state.error?React.createElement("div",{className:"alert alert-danger text-center"},React.createElement("strong",null,this.state.error)):React.createElement("button",{className:"btn-info has-spinner"},"Loading",React.createElement("span",{className:"glyphicon glyphicon-refresh glyphicon-refresh-animate"}));var disabled=!0,updateButton=null;loris.userHasPermission("candidate_parameter_edit")&&(disabled=!1,updateButton=React.createElement(ButtonElement,{label:"Update"}));var required=this.state.Data.required,subOptions={},suboptionsRequired=!1,participantStatus=this.state.formData.participantStatus?this.state.formData.participantStatus:this.state.Data.participantStatus;participantStatus&&required.indexOf(participantStatus)>-1&&(subOptions=this.state.Data.parentIDs[participantStatus],suboptionsRequired=!0);var formattedHistory=[];for(var statusKey in this.state.Data.history)if(this.state.Data.history.hasOwnProperty(statusKey)){var line="";for(var field in this.state.Data.history[statusKey])if(this.state.Data.history[statusKey].hasOwnProperty(field)){var current=this.state.Data.history[statusKey][field];if(null!==current)switch(field){case"data_entry_date":line+="[",line+=current,line+="] ";break;case"entry_staff":line+=current,line+=" ";break;case"status":line+=" Status: ",line+=current,line+=" ";break;case"suboption":line+="Details: ",line+=current,line+=" ";break;case"reason_specify":line+="Comments: ",line+=current,line+=" "}}formattedHistory.push(React.createElement("p",{key:statusKey},line))}var alertMessage="",alertClass="alert text-center hide";if(this.state.updateResult)if("success"===this.state.updateResult)alertClass="alert alert-success text-center",alertMessage="Update Successful!";else if("error"===this.state.updateResult){var errorMessage=this.state.errorMessage;alertClass="alert alert-danger text-center",alertMessage=errorMessage?errorMessage:"Failed to update!"}return React.createElement("div",{className:"row"},React.createElement("div",{className:alertClass,role:"alert",ref:"alert-message"},alertMessage),React.createElement(FormElement,{name:"participantStatus",onSubmit:this.handleSubmit,ref:"form",class:"col-md-6"},React.createElement(StaticElement,{label:"PSCID",text:this.state.Data.pscid}),React.createElement(StaticElement,{label:"DCCID",text:this.state.Data.candID}),React.createElement(SelectElement,{label:"Participant Status",name:"participantStatus",options:this.state.Data.statusOptions,value:this.state.formData.participantStatus,onUserInput:this.setFormData,ref:"participantStatus",disabled:disabled,required:!0}),React.createElement(SelectElement,{label:"Specify Reason",name:"participantSuboptions",options:subOptions,value:this.state.formData.participantSuboptions,onUserInput:this.setFormData,ref:"participantSuboptions",disabled:!suboptionsRequired,required:suboptionsRequired}),React.createElement(TextareaElement,{label:"Comments",name:"reasonSpecify",value:this.state.formData.reasonSpecify,onUserInput:this.setFormData,ref:"reasonSpecify",disabled:disabled,required:!1}),updateButton,formattedHistory))},handleSubmit:function(e){e.preventDefault();var myFormData=this.state.formData,self=this,formData=new FormData;for(var key in myFormData)""!==myFormData[key]&&formData.append(key,myFormData[key]);formData.append("tab",this.props.tabName),formData.append("candID",this.state.Data.candID),$.ajax({type:"POST",url:self.props.action,data:formData,cache:!1,contentType:!1,processData:!1,success:function(data){self.setState({updateResult:"success"}),self.showAlertMessage()},error:function(err){if(""!==err.responseText){var errorMessage=JSON.parse(err.responseText).message;self.setState({updateResult:"error",errorMessage:errorMessage}),self.showAlertMessage()}}})},showAlertMessage:function(){var self=this;if(null!==this.refs["alert-message"]){var alertMsg=this.refs["alert-message"];$(alertMsg).fadeTo(2e3,500).delay(3e3).slideUp(500,function(){self.setState({updateResult:null})})}}});exports.default=ParticipantStatus},function(module,exports){"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var ConsentStatus=React.createClass({displayName:"ConsentStatus",getInitialState:function(){return{consentOptions:{yes:"Yes",no:"No"},Data:[],formData:{},updateResult:null,errorMessage:null,isLoaded:!1,loadedData:0}},componentDidMount:function(){var that=this;$.ajax(this.props.dataURL,{dataType:"json",success:function(data){var formData={},consents=data.consents;for(var consentStatus in consents)if(consents.hasOwnProperty(consentStatus)){var consentDate=consentStatus+"_date",consentDate2=consentStatus+"_date2",consentWithdrawal=consentStatus+"_withdrawal",consentWithdrawal2=consentStatus+"_withdrawal2";formData[consentStatus]=data.consentStatuses[consentStatus],formData[consentDate]=data.consentDates[consentStatus],formData[consentDate2]=data.consentDates[consentStatus],formData[consentWithdrawal]=data.withdrawals[consentStatus],formData[consentWithdrawal2]=data.withdrawals[consentStatus]}that.setState({Data:data,formData:formData,isLoaded:!0})},error:function(data,errorCode,errorMsg){that.setState({error:"An error occurred when loading the form!"})}})},setFormData:function(formElement,value){var formData=this.state.formData;formData[formElement]=value,this.setState({formData:formData})},onSubmit:function(e){e.preventDefault()},render:function(){if(!this.state.isLoaded)return void 0!==this.state.error?React.createElement("div",{className:"alert alert-danger text-center"},React.createElement("strong",null,this.state.error)):React.createElement("button",{className:"btn-info has-spinner"},"Loading",React.createElement("span",{className:"glyphicon glyphicon-refresh glyphicon-refresh-animate"}));var disabled=!0,updateButton=null;loris.userHasPermission("candidate_parameter_edit")&&(disabled=!1,updateButton=React.createElement(ButtonElement,{label:"Update"}));var dateRequired=[],withdrawalRequired=[],i=0;for(var consent in this.state.Data.consents)if(this.state.Data.consents.hasOwnProperty(consent)){var withdrawal=consent+"_withdrawal";"yes"===this.state.formData[consent]&&(dateRequired[i]=!0),this.state.formData[withdrawal]?withdrawalRequired[i]=!0:withdrawalRequired[i]=!1,i++}var consents=[];i=0;for(var consentStatus in this.state.Data.consents)if(this.state.Data.consents.hasOwnProperty(consentStatus)){var label=this.state.Data.consents[consentStatus],consentDate=consentStatus+"_date",consentDate2=consentStatus+"_date2",consentDateLabel="Date of "+label,consentDateConfirmationLabel="Confirmation Date of "+label,consentWithdrawal=consentStatus+"_withdrawal",consentWithdrawal2=consentStatus+"_withdrawal2",consentWithdrawalLabel="Date of Withdrawal of "+label,consentWithdrawalConfirmationLabel="Confirmation Date of Withdrawal of "+label,_consent=React.createElement("div",{key:i},React.createElement(SelectElement,{label:label,name:consentStatus,options:this.state.consentOptions,value:this.state.formData[consentStatus],onUserInput:this.setFormData,ref:consentStatus,disabled:disabled,required:!1}),React.createElement(DateElement,{label:consentDateLabel,name:consentDate,value:this.state.formData[consentDate],onUserInput:this.setFormData,ref:consentDate,disabled:disabled,required:dateRequired[i]}),React.createElement(DateElement,{label:consentDateConfirmationLabel,name:consentDate2,value:this.state.formData[consentDate2],onUserInput:this.setFormData,ref:consentDate2,disabled:disabled,required:dateRequired[i]}),React.createElement(DateElement,{label:consentWithdrawalLabel,name:consentWithdrawal,value:this.state.formData[consentWithdrawal],onUserInput:this.setFormData,ref:consentWithdrawal,disabled:disabled,required:!1}),React.createElement(DateElement,{label:consentWithdrawalConfirmationLabel,name:consentWithdrawal2,value:this.state.formData[consentWithdrawal2],onUserInput:this.setFormData,ref:consentWithdrawal2,disabled:disabled,required:withdrawalRequired[i]}),React.createElement("hr",null));consents.push(_consent),i++}var formattedHistory=[];for(var consentKey in this.state.Data.history)if(this.state.Data.history.hasOwnProperty(consentKey)){var consentLabel=this.state.Data.history[consentKey].label,consentType=this.state.Data.history[consentKey].consentType;for(var field in this.state.Data.history[consentKey])if(this.state.Data.history[consentKey].hasOwnProperty(field)){var line="",historyConsent=this.state.Data.history[consentKey][field];
-for(var field2 in historyConsent)if(historyConsent.hasOwnProperty(field2)){var current=historyConsent[field2];if(null!==current)switch(field2){case"data_entry_date":line+="[",line+=current,line+="] ";break;case"entry_staff":line+=current,line+=" ";break;case consentType:line+=consentLabel+" Status: ",line+=current,line+=" ";break;case consentType+"_date":line+="Date of Consent: ",line+=current,line+=" ";break;case consentType+"_withdrawal":line+="Date of Consent Withdrawal: ",line+=current,line+=" "}}formattedHistory.push(React.createElement("p",{key:field},line))}}var alertMessage="",alertClass="alert text-center hide";if(this.state.updateResult)if("success"===this.state.updateResult)alertClass="alert alert-success text-center",alertMessage="Update Successful!";else if("error"===this.state.updateResult){var errorMessage=this.state.errorMessage;alertClass="alert alert-danger text-center",alertMessage=errorMessage?errorMessage:"Failed to update!"}return React.createElement("div",{className:"row"},React.createElement("div",{className:alertClass,role:"alert",ref:"alert-message"},alertMessage),React.createElement(FormElement,{name:"consentStatus",onSubmit:this.handleSubmit,ref:"form",class:"col-md-6"},React.createElement(StaticElement,{label:"PSCID",text:this.state.Data.pscid}),React.createElement(StaticElement,{label:"DCCID",text:this.state.Data.candID}),consents,updateButton,formattedHistory))},handleSubmit:function(e){e.preventDefault();var myFormData=this.state.formData,today=new Date,dd=today.getDate(),mm=today.getMonth()+1,yyyy=today.getFullYear();dd<10&&(dd="0"+dd),mm<10&&(mm="0"+mm),today=yyyy+"-"+mm+"-"+dd;for(var consentStatus in this.state.Data.consents)if(this.state.Data.consents.hasOwnProperty(consentStatus)){var label=this.state.Data.consents[consentStatus],consentDate=consentStatus+"_date",consentDate2=consentStatus+"_date2",date1=myFormData[consentDate]?myFormData[consentDate]:null,date2=myFormData[consentDate2]?myFormData[consentDate2]:null;if(date1!==date2)return void alert(label+" dates do not match!");if(date1>today)return void alert(label+" date cannot be later than today!");var consentWithdrawal=consentStatus+"_withdrawal",consentWithdrawal2=consentStatus+"_withdrawal2";if(date1=myFormData[consentWithdrawal]?myFormData[consentWithdrawal]:null,date2=myFormData[consentWithdrawal2]?myFormData[consentWithdrawal2]:null,date1!==date2)return void alert(label+" withdrawal dates do not match!");if(date1>today)return void alert(label+" withdrawal date cannot be later than today!")}var self=this,formData=new FormData;for(var key in myFormData)""!==myFormData[key]&&formData.append(key,myFormData[key]);formData.append("tab",this.props.tabName),formData.append("candID",this.state.Data.candID),$.ajax({type:"POST",url:self.props.action,data:formData,cache:!1,contentType:!1,processData:!1,success:function(data){self.setState({updateResult:"success"}),self.showAlertMessage()},error:function(err){if(""!==err.responseText){var errorMessage=JSON.parse(err.responseText).message;self.setState({updateResult:"error",errorMessage:errorMessage}),self.showAlertMessage()}}})},showAlertMessage:function(){var self=this;if(null!==this.refs["alert-message"]){var alertMsg=this.refs["alert-message"];$(alertMsg).fadeTo(2e3,500).delay(3e3).slideUp(500,function(){self.setState({updateResult:null})})}}});exports.default=ConsentStatus},function(module,exports){"use strict";function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}Object.defineProperty(exports,"__esModule",{value:!0});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),Tabs=function(_React$Component){function Tabs(props){_classCallCheck(this,Tabs);var _this=_possibleConstructorReturn(this,(Tabs.__proto__||Object.getPrototypeOf(Tabs)).call(this,props)),hash=window.location.hash,activeTab="";return _this.props.updateURL&&hash?activeTab=hash.substr(1):_this.props.defaultTab?activeTab=_this.props.defaultTab:_this.props.tabs.length>0&&(activeTab=_this.props.tabs[0].id),_this.state={activeTab:activeTab},_this.handleClick=_this.handleClick.bind(_this),_this.getTabs=_this.getTabs.bind(_this),_this.getTabPanes=_this.getTabPanes.bind(_this),_this}return _inherits(Tabs,_React$Component),_createClass(Tabs,[{key:"handleClick",value:function(tabId,e){if(this.setState({activeTab:tabId}),this.props.onTabChange(tabId),this.props.updateURL){var scrollDistance=$("body").scrollTop()||$("html").scrollTop();window.location.hash=e.target.hash,$("html,body").scrollTop(scrollDistance)}}},{key:"getTabs",value:function(){var tabs=this.props.tabs.map(function(tab){var tabClass=this.state.activeTab===tab.id?"active":null,href="#"+tab.id,tabID="tab-"+tab.id;return React.createElement("li",{role:"presentation",className:tabClass,key:tab.id},React.createElement("a",{id:tabID,href:href,role:"tab","data-toggle":"tab",onClick:this.handleClick.bind(null,tab.id)},tab.label))}.bind(this));return tabs}},{key:"getTabPanes",value:function(){var tabPanes=React.Children.map(this.props.children,function(child,key){if(child)return React.cloneElement(child,{activeTab:this.state.activeTab,key:key})}.bind(this));return tabPanes}},{key:"render",value:function(){var tabs=this.getTabs(),tabPanes=this.getTabPanes(),tabStyle={marginLeft:0,marginBottom:"5px"};return React.createElement("div",null,React.createElement("ul",{className:"nav nav-tabs",role:"tablist",style:tabStyle},tabs),React.createElement("div",{className:"tab-content"},tabPanes))}}]),Tabs}(React.Component);Tabs.propTypes={tabs:React.PropTypes.array.isRequired,defaultTab:React.PropTypes.string,updateURL:React.PropTypes.bool},Tabs.defaultProps={onTabChange:function(){},updateURL:!1};var TabPane=function(_React$Component2){function TabPane(){return _classCallCheck(this,TabPane),_possibleConstructorReturn(this,(TabPane.__proto__||Object.getPrototypeOf(TabPane)).apply(this,arguments))}return _inherits(TabPane,_React$Component2),_createClass(TabPane,[{key:"render",value:function(){var classList="tab-pane",title=void 0;return this.props.TabId===this.props.activeTab&&(classList+=" active"),this.props.Title&&(title=React.createElement("h1",null,this.props.Title)),React.createElement("div",{role:"tabpanel",className:classList,id:this.props.TabId},title,this.props.children)}}]),TabPane}(React.Component);TabPane.propTypes={TabId:React.PropTypes.string.isRequired,Title:React.PropTypes.string,activeTab:React.PropTypes.string},exports.Tabs=Tabs,exports.TabPane=TabPane}]);
+!function(modules){function __webpack_require__(moduleId){if(installedModules[moduleId])return installedModules[moduleId].exports;var module=installedModules[moduleId]={exports:{},id:moduleId,loaded:!1};return modules[moduleId].call(module.exports,module,module.exports,__webpack_require__),module.loaded=!0,module.exports}var installedModules={};return __webpack_require__.m=modules,__webpack_require__.c=installedModules,__webpack_require__.p="",__webpack_require__(0)}([function(module,exports,__webpack_require__){"use strict";function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}var _CandidateParameters=__webpack_require__(3),_CandidateParameters2=_interopRequireDefault(_CandidateParameters),args=QueryString.get(document.currentScript.src);$(function(){var candidateParameters=React.createElement("div",{className:"page-candidate-parameters"},React.createElement(_CandidateParameters2.default,{Module:"candidate_parameters",candID:args.candID}));ReactDOM.render(candidateParameters,document.getElementById("lorisworkspace"))})},,,function(module,exports,__webpack_require__){"use strict";function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}Object.defineProperty(exports,"__esModule",{value:!0});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),_CandidateInfo=__webpack_require__(4),_CandidateInfo2=_interopRequireDefault(_CandidateInfo),_ProbandInfo=__webpack_require__(5),_ProbandInfo2=_interopRequireDefault(_ProbandInfo),_FamilyInfo=__webpack_require__(6),_FamilyInfo2=_interopRequireDefault(_FamilyInfo),_ParticipantStatus=__webpack_require__(7),_ParticipantStatus2=_interopRequireDefault(_ParticipantStatus),_ConsentStatus=__webpack_require__(8),_ConsentStatus2=_interopRequireDefault(_ConsentStatus),_Tabs=__webpack_require__(9),CandidateParameters=function(_React$Component){function CandidateParameters(){return _classCallCheck(this,CandidateParameters),_possibleConstructorReturn(this,(CandidateParameters.__proto__||Object.getPrototypeOf(CandidateParameters)).apply(this,arguments))}return _inherits(CandidateParameters,_React$Component),_createClass(CandidateParameters,[{key:"getTabPanes",value:function(tabList){var actionURL=loris.BaseURL+"/candidate_parameters/ajax/formHandler.php",dataURL=loris.BaseURL+"/candidate_parameters/ajax/getData.php?candID="+this.props.candID,tabPanes=Object.keys(tabList).map(function(key){var TabContent=tabList[key].component;return React.createElement(_Tabs.TabPane,{TabId:tabList[key].id,key:key},React.createElement(TabContent,{action:actionURL,dataURL:dataURL+"&data="+tabList[key].id,tabName:tabList[key].id}))});return tabPanes}},{key:"render",value:function(){var tabList=[{id:"candidateInfo",label:"Candidate Information",component:_CandidateInfo2.default},{id:"participantStatus",label:"Participant Status",component:_ParticipantStatus2.default}];return"true"===loris.config("useProband")&&tabList.push({id:"probandInfo",label:"Proband Information",component:_ProbandInfo2.default}),"true"===loris.config("useFamilyID")&&tabList.push({id:"familyInfo",label:"Family Information",component:_FamilyInfo2.default}),"true"===loris.config("useConsent")&&tabList.push({id:"consentStatus",label:"Consent Status",component:_ConsentStatus2.default}),React.createElement("div",null,React.createElement("a",{className:"btn btn-sm btn-primary",href:loris.BaseURL+"/timepoint_list/?candID="+this.props.candID,style:{marginBottom:"20px"}},"Return to timepoint list"),React.createElement("br",null),React.createElement(_Tabs.Tabs,{tabs:tabList,defaultTab:"candidateInfo",updateURL:!0},this.getTabPanes(tabList)))}}]),CandidateParameters}(React.Component);CandidateParameters.propTypes={},CandidateParameters.defaultProps={},exports.default=CandidateParameters},function(module,exports){"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var CandidateInfo=React.createClass({displayName:"CandidateInfo",getInitialState:function(){return{caveatOptions:{true:"True",false:"False"},Data:[],formData:{},updateResult:null,errorMessage:null,isLoaded:!1,loadedData:0}},componentDidMount:function(){var that=this;$.ajax(this.props.dataURL,{dataType:"json",success:function(data){var formData={flaggedCaveatemptor:data.flagged_caveatemptor,flaggedOther:data.flagged_other,flaggedReason:data.flagged_reason};Object.assign(formData,data.parameter_values),that.setState({Data:data,isLoaded:!0,formData:formData})},error:function(data,errorCode,errorMsg){that.setState({error:"An error occurred when loading the form!"})}})},setFormData:function(formElement,value){var formData=JSON.parse(JSON.stringify(this.state.formData));formData[formElement]=value,"flaggedCaveatemptor"===formElement&&"false"===value&&(formData.flaggedReason="",formData.flaggedOther=""),"flaggedReason"===formElement&&"Other"!==this.state.Data.caveatReasonOptions[value]&&(formData.flaggedOther=""),this.setState({formData:formData})},addListItem:function(formElement,value,pendingValKey){var formData=this.state.formData,listItems=formData[formElement]||[];listItems.push(value),formData[formElement]=listItems,formData[pendingValKey]=null,this.setState({formData:formData})},removeListItem:function(formElement,value){var formData=this.state.formData,listItems=formData[formElement],index=listItems.indexOf(value);index>-1&&(listItems.splice(index,1),formData[formElement]=listItems,this.setState({formData:formData}))},onSubmit:function(e){e.preventDefault()},render:function(){if(!this.state.isLoaded)return void 0!==this.state.error?React.createElement("div",{className:"alert alert-danger text-center"},React.createElement("strong",null,this.state.error)):React.createElement("button",{className:"btn-info has-spinner"},"Loading",React.createElement("span",{className:"glyphicon glyphicon-refresh glyphicon-refresh-animate"}));var disabled=!0,updateButton=null;loris.userHasPermission("candidate_parameter_edit")&&(disabled=!1,updateButton=React.createElement(ButtonElement,{label:"Update"}));var reasonDisabled=!0,reasonRequired=!1;"true"===this.state.formData.flaggedCaveatemptor&&(reasonDisabled=!1,reasonRequired=!0);var reasonKey=null,specifyOther=null,otherDisabled=!0,otherRequired=!1;for(var key in this.state.Data.caveatReasonOptions)if(this.state.Data.caveatReasonOptions.hasOwnProperty(key)&&"Other"===this.state.Data.caveatReasonOptions[key]){reasonKey=key;break}this.state.formData.flaggedReason===reasonKey&&(otherRequired=!0,otherDisabled=!1),"false"===this.state.formData.flaggedCaveatemptor&&(reasonDisabled=!0,reasonRequired=!1,otherDisabled=!0,otherRequired=!1),null!==reasonKey&&(specifyOther=React.createElement(TextareaElement,{label:"If Other, please specify",name:"flaggedOther",value:this.state.formData.flaggedOther,onUserInput:this.setFormData,ref:"flaggedOther",disabled:otherDisabled,required:otherRequired}));var extraParameterFields=[],extraParameters=this.state.Data.extra_parameters;for(var key2 in extraParameters)if(extraParameters.hasOwnProperty(key2)){var paramTypeID=extraParameters[key2].ParameterTypeID,name=paramTypeID,value=this.state.formData[paramTypeID];switch(extraParameters[key2].Type.substring(0,3)){case"enu":var types=extraParameters[key2].Type.substring(5);types=types.slice(0,-1),types=types.replace(/'/g,""),types=types.split(",");var selectOptions={};for(var key3 in types)types.hasOwnProperty(key3)&&(selectOptions[types[key3]]=types[key3]);extraParameterFields.push(React.createElement(SelectElement,{label:extraParameters[key2].Description,name:name,options:selectOptions,value:value,onUserInput:this.setFormData,ref:name,disabled:disabled,key:key2}));break;case"dat":extraParameterFields.push(React.createElement(DateElement,{label:extraParameters[key2].Description,name:name,value:value,onUserInput:this.setFormData,ref:name,disabled:disabled,key:key2}));break;default:extraParameterFields.push(React.createElement(TextareaElement,{label:extraParameters[key2].Description,name:name,value:value,onUserInput:this.setFormData,ref:name,disabled:disabled,key:key2}))}}var alertMessage="",alertClass="alert text-center hide";if(this.state.updateResult)if("success"===this.state.updateResult)alertClass="alert alert-success text-center",alertMessage="Update Successful!";else if("error"===this.state.updateResult){var errorMessage=this.state.errorMessage;alertClass="alert alert-danger text-center",alertMessage=errorMessage?errorMessage:"Failed to update!"}var snacks={1:"Pretzel",57:"Goldfish",15:"Cheezball",25:"Gummi worm",33:"Bugle",45:"Fruit rollup",102:"Fruit by the foot"};return React.createElement("div",{className:"row"},React.createElement("div",{className:alertClass,role:"alert",ref:"alert-message"},alertMessage),React.createElement(FormElement,{name:"candidateInfo",onSubmit:this.handleSubmit,ref:"form",class:"col-md-6"},React.createElement(StaticElement,{label:"PSCID",text:this.state.Data.pscid}),React.createElement(StaticElement,{label:"DCCID",text:this.state.Data.candID}),React.createElement(SelectElement,{label:"Caveat Emptor Flag for Candidate",name:"flaggedCaveatemptor",options:this.state.caveatOptions,value:this.state.formData.flaggedCaveatemptor,onUserInput:this.setFormData,ref:"flaggedCaveatemptor",disabled:disabled,required:!0}),React.createElement(SelectElement,{label:"Reason for Caveat Emptor Flag",name:"flaggedReason",options:this.state.Data.caveatReasonOptions,value:this.state.formData.flaggedReason,onUserInput:this.setFormData,ref:"flaggedReason",disabled:reasonDisabled,required:reasonRequired}),React.createElement(TagsElement,{label:"Favorite snacks?",name:"testList",id:"testList",btnLabel:"Add Snack",useSearch:!0,strictSearch:!0,options:snacks,items:this.state.formData.testList,value:this.state.formData.pendingListItem,required:!0,pendingValKey:"pendingListItem",onUserInput:this.setFormData,onUserAdd:this.addListItem,onUserRemove:this.removeListItem}),specifyOther,extraParameterFields,updateButton))},handleSubmit:function(e){e.preventDefault();var myFormData=this.state.formData,self=this,formData=new FormData;for(var key in myFormData)myFormData.hasOwnProperty(key)&&""!==myFormData[key]&&formData.append(key,myFormData[key]);formData.append("tab",this.props.tabName),formData.append("candID",this.state.Data.candID),$.ajax({type:"POST",url:self.props.action,data:formData,cache:!1,contentType:!1,processData:!1,success:function(data){self.setState({updateResult:"success"}),self.showAlertMessage()},error:function(err){if(""!==err.responseText){var errorMessage=JSON.parse(err.responseText).message;self.setState({updateResult:"error",errorMessage:errorMessage}),self.showAlertMessage()}}})},showAlertMessage:function(){var self=this;if(null!==this.refs["alert-message"]){var alertMsg=this.refs["alert-message"];$(alertMsg).fadeTo(2e3,500).delay(3e3).slideUp(500,function(){self.setState({updateResult:null})})}}});exports.default=CandidateInfo},function(module,exports){"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var ProbandInfo=React.createClass({displayName:"ProbandInfo",getInitialState:function(){return{genderOptions:{Male:"Male",Female:"Female"},Data:[],formData:{},updateResult:null,errorMessage:null,isLoaded:!1,loadedData:0}},componentDidMount:function(){var that=this;$.ajax(this.props.dataURL,{dataType:"json",success:function(data){var formData={ProbandGender:data.ProbandGender,ProbandDoB:data.ProbandDoB,ProbandDoB2:data.ProbandDoB};that.setState({formData:formData,Data:data,isLoaded:!0})},error:function(data,errorCode,errorMsg){that.setState({error:"An error occurred when loading the form!"})}})},setFormData:function(formElement,value){var formData=this.state.formData;formData[formElement]=value,this.setState({formData:formData})},onSubmit:function(e){e.preventDefault()},render:function(){var _this=this;if(!this.state.isLoaded)return void 0!==this.state.error?React.createElement("div",{className:"alert alert-danger text-center"},React.createElement("strong",null,this.state.error)):React.createElement("button",{className:"btn-info has-spinner"},"Loading",React.createElement("span",{className:"glyphicon glyphicon-refresh glyphicon-refresh-animate"}));var disabled=!0,updateButton=null;loris.userHasPermission("candidate_parameter_edit")&&(disabled=!1,updateButton=React.createElement(ButtonElement,{label:"Update"}));var dobRequired=!1,dob2Required=!1;null!==this.state.formData.ProbandGender&&(dobRequired=!0),null!==this.state.formData.ProbandDoB&&(dob2Required=!0);var extraParameters=this.state.Data.extra_parameters,extraParameterFields=extraParameters.map(function(extraParam){var paramTypeID=extraParam.ParameterTypeID,name="PTID"+paramTypeID,value=_this.state.Data.parameter_values[paramTypeID];switch(extraParam.Type.substring(0,3)){case"enu":var types=extraParam.Type.substring(5);types=types.slice(0,-1),types=types.replace(/'/g,""),types=types.split(",");var selectOptions={};return types.forEach(function(type){selectOptions[type]=type}),React.createElement(SelectElement,{label:extraParam.Description,name:name,options:selectOptions,value:value,onUserInput:_this.setFormData,ref:name,disabled:disabled});case"dat":return React.createElement(DateElement,{label:extraParam.Description,name:name,value:value,onUserInput:_this.setFormData,ref:name,disabled:disabled});default:return React.createElement(TextareaElement,{label:extraParam.Description,name:name,value:value,onUserInput:_this.setFormData,ref:name,disabled:disabled})}}),alertMessage="",alertClass="alert text-center hide";if(this.state.updateResult)if("success"===this.state.updateResult)alertClass="alert alert-success text-center",alertMessage="Update Successful!";else if("error"===this.state.updateResult){var errorMessage=this.state.errorMessage;alertClass="alert alert-danger text-center",alertMessage=errorMessage?errorMessage:"Failed to update!"}return React.createElement("div",{className:"row"},React.createElement("div",{className:alertClass,role:"alert",ref:"alert-message"},alertMessage),React.createElement(FormElement,{name:"probandInfo",onSubmit:this.handleSubmit,ref:"form",class:"col-md-6"},React.createElement(StaticElement,{label:"PSCID",text:this.state.Data.pscid}),React.createElement(StaticElement,{label:"DCCID",text:this.state.Data.candID}),React.createElement(SelectElement,{label:"Proband Gender",name:"ProbandGender",options:this.state.genderOptions,value:this.state.formData.ProbandGender,onUserInput:this.setFormData,ref:"ProbandGender",disabled:disabled,required:!0}),React.createElement(DateElement,{label:"DoB Proband",name:"ProbandDoB",value:this.state.formData.ProbandDoB,onUserInput:this.setFormData,ref:"ProbandDoB",disabled:disabled,required:dobRequired}),React.createElement(DateElement,{label:"Confirm DoB Proband",name:"ProbandDoB2",value:this.state.formData.ProbandDoB2,onUserInput:this.setFormData,ref:"ProbandDoB2",disabled:disabled,required:dob2Required}),React.createElement(StaticElement,{label:"Age Difference (months)",text:this.state.Data.ageDifference.toString()}),extraParameterFields,updateButton))},handleSubmit:function(e){e.preventDefault();var myFormData=this.state.formData,today=new Date,dd=today.getDate(),mm=today.getMonth()+1,yyyy=today.getFullYear();dd<10&&(dd="0"+dd),mm<10&&(mm="0"+mm),today=yyyy+"-"+mm+"-"+dd;var dob1=myFormData.ProbandDoB?myFormData.ProbandDoB:null,dob2=myFormData.ProbandDoB2?myFormData.ProbandDoB2:null;if(dob1!==dob2)return void alert("DOB do not match!");if(dob1>today)return void alert("Proband date of birth cannot be later than today!");var self=this,formData=new FormData;for(var key in myFormData)""!==myFormData[key]&&formData.append(key,myFormData[key]);formData.append("tab",this.props.tabName),formData.append("candID",this.state.Data.candID),$.ajax({type:"POST",url:self.props.action,data:formData,cache:!1,contentType:!1,processData:!1,success:function(data){self.setState({updateResult:"success"}),self.showAlertMessage()},error:function(err){if(""!==err.responseText){var errorMessage=JSON.parse(err.responseText).message;self.setState({updateResult:"error",errorMessage:errorMessage}),self.showAlertMessage()}}})},showAlertMessage:function(){var self=this;if(null!==this.refs["alert-message"]){var alertMsg=this.refs["alert-message"];$(alertMsg).fadeTo(2e3,500).delay(3e3).slideUp(500,function(){self.setState({updateResult:null})})}}});exports.default=ProbandInfo},function(module,exports){"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var FamilyInfo=React.createClass({displayName:"FamilyInfo",getInitialState:function(){return{Data:[],formData:{},familyMembers:[],updateResult:null,errorMessage:null,isLoaded:!1,loadedData:0}},componentDidMount:function(){var that=this;$.ajax(this.props.dataURL,{dataType:"json",xhr:function xhr(){var xhr=new window.XMLHttpRequest;return xhr.addEventListener("progress",function(evt){that.setState({loadedData:evt.loaded})}),xhr},success:function(data){that.setState({Data:data,isLoaded:!0,familyMembers:data.existingFamilyMembers})},error:function(data,errorCode,errorMsg){that.setState({error:"An error occurred when loading the form!"})}})},setFormData:function(formElement,value){var formData=this.state.formData;formData[formElement]=value,this.setState({formData:formData})},onSubmit:function(e){e.preventDefault()},render:function(){if(!this.state.isLoaded)return void 0!==this.state.error?React.createElement("div",{className:"alert alert-danger text-center"},React.createElement("strong",null,this.state.error)):React.createElement("button",{className:"btn-info has-spinner"},"Loading",React.createElement("span",{className:"glyphicon glyphicon-refresh glyphicon-refresh-animate"}));var relationshipOptions={full_sibling:"Full Sibling",half_sibling:"Half Sibling","1st_cousin":"First Cousin"},disabled=!0,addButton=null;loris.userHasPermission("candidate_parameter_edit")&&(disabled=!1,addButton=React.createElement(ButtonElement,{label:"Add"}));var candidateList=this.state.Data.candidates,familyMembers=this.state.familyMembers,familyMembersHTML=[];for(var key in familyMembers)if(familyMembers.hasOwnProperty(key)){var candID=familyMembers[key].FamilyCandID,relationship=familyMembers[key].Relationship_type,link="?candID="+candID+"&identifier="+candID;familyMembersHTML.push(React.createElement("div",{key:key},React.createElement(StaticElement,{label:"Family Member DCCID",text:React.createElement("a",{href:link},candID)}),React.createElement(StaticElement,{label:"Relation Type",text:relationshipOptions[relationship]}),React.createElement(ButtonElement,{label:"Delete",type:"button",onUserInput:this.deleteFamilyMember.bind(null,candID,key,candidateList)}),React.createElement("hr",null))),delete candidateList[candID]}var alertMessage="",alertClass="alert text-center hide";if(this.state.updateResult)if("success"===this.state.updateResult)alertClass="alert alert-success text-center",alertMessage="Update Successful!";else if("error"===this.state.updateResult){var errorMessage=this.state.errorMessage;alertClass="alert alert-danger text-center",alertMessage=errorMessage?errorMessage:"Failed to update!"}return React.createElement("div",{className:"row"},React.createElement("div",{className:alertClass,role:"alert",ref:"alert-message"},alertMessage),React.createElement(FormElement,{name:"familyInfo",onSubmit:this.handleSubmit,ref:"form",class:"col-md-6"},React.createElement(StaticElement,{label:"PSCID",text:this.state.Data.pscid}),React.createElement(StaticElement,{label:"DCCID",text:this.state.Data.candID}),React.createElement("hr",null),familyMembersHTML,React.createElement(SelectElement,{label:"Family Member ID (DCCID)",name:"FamilyCandID",options:candidateList,onUserInput:this.setFormData,ref:"FamilyCandID",disabled:disabled,required:!0,value:this.state.formData.FamilyCandID}),React.createElement(SelectElement,{label:"Relation Type",name:"Relationship_type",options:relationshipOptions,onUserInput:this.setFormData,ref:"Relationship_type",disabled:disabled,required:!0,value:this.state.formData.Relationship_type}),addButton))},handleSubmit:function(e){e.preventDefault();var myFormData=this.state.formData,self=this,formData=new FormData,formRefs=this.refs,familyMembers=this.state.familyMembers,familyMember={};for(var key in myFormData)myFormData.hasOwnProperty(key)&&""!==myFormData[key]&&(familyMember[key]=myFormData[key],formData.append(key,myFormData[key]));formData.append("tab",this.props.tabName),formData.append("candID",this.state.Data.candID),familyMembers.push(familyMember),this.setState({familyMembers:familyMembers}),$.ajax({type:"POST",url:self.props.action,data:formData,cache:!1,contentType:!1,processData:!1,success:function(data){self.setState({updateResult:"success",formData:{}}),self.showAlertMessage(),Object.keys(formRefs).map(function(ref){formRefs[ref].state&&formRefs[ref].state.value&&(formRefs[ref].state.value="")}),self.forceUpdate()},error:function(err){var errorMessage=JSON.parse(err.responseText).message;self.setState({updateResult:"error",errorMessage:errorMessage}),self.showAlertMessage()}})},showAlertMessage:function(){var self=this;if(null!==this.refs["alert-message"]){var alertMsg=this.refs["alert-message"];$(alertMsg).fadeTo(2e3,500).delay(3e3).slideUp(500,function(){self.setState({updateResult:null})})}},deleteFamilyMember:function(candID,key,candidateList){var familyMembers=this.state.familyMembers;delete familyMembers[key],candidateList[candID]=candID,this.setState({familyMembers:familyMembers});var myFormData=this.state.formData,self=this,formData=new FormData;for(var _key in myFormData)myFormData.hasOwnProperty(_key)&&""!==myFormData[_key]&&formData.append(_key,myFormData[_key]);formData.append("tab","deleteFamilyMember"),formData.append("candID",this.state.Data.candID),formData.append("familyDCCID",candID),$.ajax({type:"POST",url:self.props.action,data:formData,cache:!1,contentType:!1,processData:!1,success:function(data){self.setState({updateResult:"success"}),self.showAlertMessage()},error:function(err){if(""!==err.responseText){var errorMessage=JSON.parse(err.responseText).message;self.setState({updateResult:"error",errorMessage:errorMessage}),self.showAlertMessage()}}})}});exports.default=FamilyInfo},function(module,exports){"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var ParticipantStatus=React.createClass({displayName:"ParticipantStatus",getInitialState:function(){return{Data:[],formData:{},updateResult:null,errorMessage:null,isLoaded:!1,loadedData:0}},componentDidMount:function(){var that=this;$.ajax(this.props.dataURL,{dataType:"json",xhr:function xhr(){var xhr=new window.XMLHttpRequest;return xhr.addEventListener("progress",function(evt){that.setState({loadedData:evt.loaded})}),xhr},success:function(data){var formData={};formData.participantStatus=data.participantStatus,formData.participantSuboptions=data.participantSuboptions,formData.reasonSpecify=data.reasonSpecify,that.setState({Data:data,formData:formData,isLoaded:!0})},error:function(data,errorCode,errorMsg){that.setState({error:"An error occurred when loading the form!"})}})},setFormData:function(formElement,value){var formData=this.state.formData,required=this.state.Data.required;"participantStatus"===formElement&&required.indexOf(value)<0&&(formData.participantSuboptions=""),formData[formElement]=value,this.setState({formData:formData})},onSubmit:function(e){e.preventDefault()},render:function(){if(!this.state.isLoaded)return void 0!==this.state.error?React.createElement("div",{className:"alert alert-danger text-center"},React.createElement("strong",null,this.state.error)):React.createElement("button",{className:"btn-info has-spinner"},"Loading",React.createElement("span",{className:"glyphicon glyphicon-refresh glyphicon-refresh-animate"}));var disabled=!0,updateButton=null;loris.userHasPermission("candidate_parameter_edit")&&(disabled=!1,updateButton=React.createElement(ButtonElement,{label:"Update"}));var required=this.state.Data.required,subOptions={},suboptionsRequired=!1,participantStatus=this.state.formData.participantStatus?this.state.formData.participantStatus:this.state.Data.participantStatus;participantStatus&&required.indexOf(participantStatus)>-1&&(subOptions=this.state.Data.parentIDs[participantStatus],suboptionsRequired=!0);var formattedHistory=[];for(var statusKey in this.state.Data.history)if(this.state.Data.history.hasOwnProperty(statusKey)){var line="";for(var field in this.state.Data.history[statusKey])if(this.state.Data.history[statusKey].hasOwnProperty(field)){var current=this.state.Data.history[statusKey][field];if(null!==current)switch(field){case"data_entry_date":line+="[",line+=current,line+="] ";break;case"entry_staff":line+=current,line+=" ";break;case"status":line+=" Status: ",line+=current,line+=" ";break;case"suboption":line+="Details: ",line+=current,line+=" ";break;case"reason_specify":line+="Comments: ",line+=current,line+=" "}}formattedHistory.push(React.createElement("p",{key:statusKey},line))}var alertMessage="",alertClass="alert text-center hide";if(this.state.updateResult)if("success"===this.state.updateResult)alertClass="alert alert-success text-center",alertMessage="Update Successful!";else if("error"===this.state.updateResult){var errorMessage=this.state.errorMessage;alertClass="alert alert-danger text-center",alertMessage=errorMessage?errorMessage:"Failed to update!"}return React.createElement("div",{className:"row"},React.createElement("div",{className:alertClass,role:"alert",ref:"alert-message"},alertMessage),React.createElement(FormElement,{name:"participantStatus",onSubmit:this.handleSubmit,ref:"form",class:"col-md-6"},React.createElement(StaticElement,{label:"PSCID",text:this.state.Data.pscid}),React.createElement(StaticElement,{label:"DCCID",text:this.state.Data.candID}),React.createElement(SelectElement,{label:"Participant Status",name:"participantStatus",options:this.state.Data.statusOptions,value:this.state.formData.participantStatus,onUserInput:this.setFormData,ref:"participantStatus",disabled:disabled,required:!0}),React.createElement(SelectElement,{label:"Specify Reason",name:"participantSuboptions",options:subOptions,value:this.state.formData.participantSuboptions,onUserInput:this.setFormData,ref:"participantSuboptions",disabled:!suboptionsRequired,required:suboptionsRequired}),React.createElement(TextareaElement,{label:"Comments",name:"reasonSpecify",value:this.state.formData.reasonSpecify,onUserInput:this.setFormData,ref:"reasonSpecify",disabled:disabled,required:!1}),updateButton,formattedHistory))},handleSubmit:function(e){e.preventDefault();var myFormData=this.state.formData,self=this,formData=new FormData;for(var key in myFormData)""!==myFormData[key]&&formData.append(key,myFormData[key]);formData.append("tab",this.props.tabName),formData.append("candID",this.state.Data.candID),$.ajax({type:"POST",url:self.props.action,data:formData,cache:!1,contentType:!1,processData:!1,success:function(data){self.setState({updateResult:"success"}),self.showAlertMessage()},error:function(err){if(""!==err.responseText){var errorMessage=JSON.parse(err.responseText).message;self.setState({updateResult:"error",errorMessage:errorMessage}),self.showAlertMessage()}}})},showAlertMessage:function(){var self=this;if(null!==this.refs["alert-message"]){var alertMsg=this.refs["alert-message"];$(alertMsg).fadeTo(2e3,500).delay(3e3).slideUp(500,function(){self.setState({updateResult:null})})}}});exports.default=ParticipantStatus},function(module,exports){"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var ConsentStatus=React.createClass({displayName:"ConsentStatus",getInitialState:function(){return{consentOptions:{yes:"Yes",no:"No"},Data:[],formData:{},updateResult:null,errorMessage:null,isLoaded:!1,loadedData:0}},componentDidMount:function(){var that=this;$.ajax(this.props.dataURL,{dataType:"json",success:function(data){var formData={},consents=data.consents;for(var consentStatus in consents)if(consents.hasOwnProperty(consentStatus)){var consentDate=consentStatus+"_date",consentDate2=consentStatus+"_date2",consentWithdrawal=consentStatus+"_withdrawal",consentWithdrawal2=consentStatus+"_withdrawal2";formData[consentStatus]=data.consentStatuses[consentStatus],formData[consentDate]=data.consentDates[consentStatus],formData[consentDate2]=data.consentDates[consentStatus],formData[consentWithdrawal]=data.withdrawals[consentStatus],formData[consentWithdrawal2]=data.withdrawals[consentStatus]}that.setState({Data:data,formData:formData,isLoaded:!0})},error:function(data,errorCode,errorMsg){that.setState({error:"An error occurred when loading the form!"})}})},setFormData:function(formElement,value){var formData=this.state.formData;formData[formElement]=value,this.setState({formData:formData})},onSubmit:function(e){e.preventDefault()},render:function(){if(!this.state.isLoaded)return void 0!==this.state.error?React.createElement("div",{className:"alert alert-danger text-center"},React.createElement("strong",null,this.state.error)):React.createElement("button",{className:"btn-info has-spinner"},"Loading",React.createElement("span",{className:"glyphicon glyphicon-refresh glyphicon-refresh-animate"}));var disabled=!0,updateButton=null;loris.userHasPermission("candidate_parameter_edit")&&(disabled=!1,updateButton=React.createElement(ButtonElement,{label:"Update"}));var dateRequired=[],withdrawalRequired=[],i=0;for(var consent in this.state.Data.consents)if(this.state.Data.consents.hasOwnProperty(consent)){var withdrawal=consent+"_withdrawal";"yes"===this.state.formData[consent]&&(dateRequired[i]=!0),this.state.formData[withdrawal]?withdrawalRequired[i]=!0:withdrawalRequired[i]=!1,i++}var consents=[];i=0;for(var consentStatus in this.state.Data.consents)if(this.state.Data.consents.hasOwnProperty(consentStatus)){var label=this.state.Data.consents[consentStatus],consentDate=consentStatus+"_date",consentDate2=consentStatus+"_date2",consentDateLabel="Date of "+label,consentDateConfirmationLabel="Confirmation Date of "+label,consentWithdrawal=consentStatus+"_withdrawal",consentWithdrawal2=consentStatus+"_withdrawal2",consentWithdrawalLabel="Date of Withdrawal of "+label,consentWithdrawalConfirmationLabel="Confirmation Date of Withdrawal of "+label,_consent=React.createElement("div",{key:i},React.createElement(SelectElement,{label:label,name:consentStatus,options:this.state.consentOptions,value:this.state.formData[consentStatus],onUserInput:this.setFormData,ref:consentStatus,disabled:disabled,required:!1}),React.createElement(DateElement,{label:consentDateLabel,name:consentDate,value:this.state.formData[consentDate],onUserInput:this.setFormData,ref:consentDate,disabled:disabled,required:dateRequired[i]}),React.createElement(DateElement,{label:consentDateConfirmationLabel,name:consentDate2,value:this.state.formData[consentDate2],onUserInput:this.setFormData,ref:consentDate2,
+disabled:disabled,required:dateRequired[i]}),React.createElement(DateElement,{label:consentWithdrawalLabel,name:consentWithdrawal,value:this.state.formData[consentWithdrawal],onUserInput:this.setFormData,ref:consentWithdrawal,disabled:disabled,required:!1}),React.createElement(DateElement,{label:consentWithdrawalConfirmationLabel,name:consentWithdrawal2,value:this.state.formData[consentWithdrawal2],onUserInput:this.setFormData,ref:consentWithdrawal2,disabled:disabled,required:withdrawalRequired[i]}),React.createElement("hr",null));consents.push(_consent),i++}var formattedHistory=[];for(var consentKey in this.state.Data.history)if(this.state.Data.history.hasOwnProperty(consentKey)){var consentLabel=this.state.Data.history[consentKey].label,consentType=this.state.Data.history[consentKey].consentType;for(var field in this.state.Data.history[consentKey])if(this.state.Data.history[consentKey].hasOwnProperty(field)){var line="",historyConsent=this.state.Data.history[consentKey][field];for(var field2 in historyConsent)if(historyConsent.hasOwnProperty(field2)){var current=historyConsent[field2];if(null!==current)switch(field2){case"data_entry_date":line+="[",line+=current,line+="] ";break;case"entry_staff":line+=current,line+=" ";break;case consentType:line+=consentLabel+" Status: ",line+=current,line+=" ";break;case consentType+"_date":line+="Date of Consent: ",line+=current,line+=" ";break;case consentType+"_withdrawal":line+="Date of Consent Withdrawal: ",line+=current,line+=" "}}formattedHistory.push(React.createElement("p",{key:field},line))}}var alertMessage="",alertClass="alert text-center hide";if(this.state.updateResult)if("success"===this.state.updateResult)alertClass="alert alert-success text-center",alertMessage="Update Successful!";else if("error"===this.state.updateResult){var errorMessage=this.state.errorMessage;alertClass="alert alert-danger text-center",alertMessage=errorMessage?errorMessage:"Failed to update!"}return React.createElement("div",{className:"row"},React.createElement("div",{className:alertClass,role:"alert",ref:"alert-message"},alertMessage),React.createElement(FormElement,{name:"consentStatus",onSubmit:this.handleSubmit,ref:"form",class:"col-md-6"},React.createElement(StaticElement,{label:"PSCID",text:this.state.Data.pscid}),React.createElement(StaticElement,{label:"DCCID",text:this.state.Data.candID}),consents,updateButton,formattedHistory))},handleSubmit:function(e){e.preventDefault();var myFormData=this.state.formData,today=new Date,dd=today.getDate(),mm=today.getMonth()+1,yyyy=today.getFullYear();dd<10&&(dd="0"+dd),mm<10&&(mm="0"+mm),today=yyyy+"-"+mm+"-"+dd;for(var consentStatus in this.state.Data.consents)if(this.state.Data.consents.hasOwnProperty(consentStatus)){var label=this.state.Data.consents[consentStatus],consentDate=consentStatus+"_date",consentDate2=consentStatus+"_date2",date1=myFormData[consentDate]?myFormData[consentDate]:null,date2=myFormData[consentDate2]?myFormData[consentDate2]:null;if(date1!==date2)return void alert(label+" dates do not match!");if(date1>today)return void alert(label+" date cannot be later than today!");var consentWithdrawal=consentStatus+"_withdrawal",consentWithdrawal2=consentStatus+"_withdrawal2";if(date1=myFormData[consentWithdrawal]?myFormData[consentWithdrawal]:null,date2=myFormData[consentWithdrawal2]?myFormData[consentWithdrawal2]:null,date1!==date2)return void alert(label+" withdrawal dates do not match!");if(date1>today)return void alert(label+" withdrawal date cannot be later than today!")}var self=this,formData=new FormData;for(var key in myFormData)""!==myFormData[key]&&formData.append(key,myFormData[key]);formData.append("tab",this.props.tabName),formData.append("candID",this.state.Data.candID),$.ajax({type:"POST",url:self.props.action,data:formData,cache:!1,contentType:!1,processData:!1,success:function(data){self.setState({updateResult:"success"}),self.showAlertMessage()},error:function(err){if(""!==err.responseText){var errorMessage=JSON.parse(err.responseText).message;self.setState({updateResult:"error",errorMessage:errorMessage}),self.showAlertMessage()}}})},showAlertMessage:function(){var self=this;if(null!==this.refs["alert-message"]){var alertMsg=this.refs["alert-message"];$(alertMsg).fadeTo(2e3,500).delay(3e3).slideUp(500,function(){self.setState({updateResult:null})})}}});exports.default=ConsentStatus},function(module,exports){"use strict";function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}Object.defineProperty(exports,"__esModule",{value:!0});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),Tabs=function(_React$Component){function Tabs(props){_classCallCheck(this,Tabs);var _this=_possibleConstructorReturn(this,(Tabs.__proto__||Object.getPrototypeOf(Tabs)).call(this,props)),hash=window.location.hash,activeTab="";return _this.props.updateURL&&hash?activeTab=hash.substr(1):_this.props.defaultTab?activeTab=_this.props.defaultTab:_this.props.tabs.length>0&&(activeTab=_this.props.tabs[0].id),_this.state={activeTab:activeTab},_this.handleClick=_this.handleClick.bind(_this),_this.getTabs=_this.getTabs.bind(_this),_this.getTabPanes=_this.getTabPanes.bind(_this),_this}return _inherits(Tabs,_React$Component),_createClass(Tabs,[{key:"handleClick",value:function(tabId,e){if(this.setState({activeTab:tabId}),this.props.onTabChange(tabId),this.props.updateURL){var scrollDistance=$("body").scrollTop()||$("html").scrollTop();window.location.hash=e.target.hash,$("html,body").scrollTop(scrollDistance)}}},{key:"getTabs",value:function(){var tabs=this.props.tabs.map(function(tab){var tabClass=this.state.activeTab===tab.id?"active":null,href="#"+tab.id,tabID="tab-"+tab.id;return React.createElement("li",{role:"presentation",className:tabClass,key:tab.id},React.createElement("a",{id:tabID,href:href,role:"tab","data-toggle":"tab",onClick:this.handleClick.bind(null,tab.id)},tab.label))}.bind(this));return tabs}},{key:"getTabPanes",value:function(){var tabPanes=React.Children.map(this.props.children,function(child,key){if(child)return React.cloneElement(child,{activeTab:this.state.activeTab,key:key})}.bind(this));return tabPanes}},{key:"render",value:function(){var tabs=this.getTabs(),tabPanes=this.getTabPanes(),tabStyle={marginLeft:0,marginBottom:"5px"};return React.createElement("div",null,React.createElement("ul",{className:"nav nav-tabs",role:"tablist",style:tabStyle},tabs),React.createElement("div",{className:"tab-content"},tabPanes))}}]),Tabs}(React.Component);Tabs.propTypes={tabs:React.PropTypes.array.isRequired,defaultTab:React.PropTypes.string,updateURL:React.PropTypes.bool},Tabs.defaultProps={onTabChange:function(){},updateURL:!0};var VerticalTabs=function(_React$Component2){function VerticalTabs(props){_classCallCheck(this,VerticalTabs);var _this2=_possibleConstructorReturn(this,(VerticalTabs.__proto__||Object.getPrototypeOf(VerticalTabs)).call(this,props)),hash=window.location.hash,activeTab="";return _this2.props.updateURL&&hash?activeTab=hash.substr(1):_this2.props.defaultTab?activeTab=_this2.props.defaultTab:_this2.props.tabs.length>0&&(activeTab=_this2.props.tabs[0].id),_this2.state={activeTab:activeTab},_this2.handleClick=_this2.handleClick.bind(_this2),_this2.getTabs=_this2.getTabs.bind(_this2),_this2.getTabPanes=_this2.getTabPanes.bind(_this2),_this2}return _inherits(VerticalTabs,_React$Component2),_createClass(VerticalTabs,[{key:"handleClick",value:function(tabId,e){if(this.setState({activeTab:tabId}),this.props.onTabChange(tabId),this.props.updateURL){var scrollDistance=$("body").scrollTop()||$("html").scrollTop();window.location.hash=e.target.hash,$("html,body").scrollTop(scrollDistance)}}},{key:"getTabs",value:function(){var tabs=this.props.tabs.map(function(tab){var tabClass=this.state.activeTab===tab.id?"active":null,href="#"+tab.id,tabID="tab-"+tab.id;return React.createElement("li",{role:"presentation",className:tabClass,key:tab.id},React.createElement("a",{id:tabID,href:href,role:"tab","data-toggle":"tab",onClick:this.handleClick.bind(null,tab.id)},tab.label))}.bind(this));return tabs}},{key:"getTabPanes",value:function(){var tabPanes=React.Children.map(this.props.children,function(child,key){if(child)return React.cloneElement(child,{activeTab:this.state.activeTab,key:key})}.bind(this));return tabPanes}},{key:"render",value:function(){var tabs=this.getTabs(),tabPanes=this.getTabPanes(),tabStyle={marginLeft:0,marginBottom:"5px"};return React.createElement("div",null,React.createElement("div",{className:"tabbable col-md-3 col-sm-3"},React.createElement("ul",{className:"nav nav-pills nav-stacked",role:"tablist",style:tabStyle},tabs)),React.createElement("div",{className:"tab-content col-md-9 col-sm-9"},tabPanes))}}]),VerticalTabs}(React.Component);VerticalTabs.propTypes={tabs:React.PropTypes.array.isRequired,defaultTab:React.PropTypes.string,updateURL:React.PropTypes.bool},VerticalTabs.defaultProps={onTabChange:function(){},updateURL:!0};var TabPane=function(_React$Component3){function TabPane(){return _classCallCheck(this,TabPane),_possibleConstructorReturn(this,(TabPane.__proto__||Object.getPrototypeOf(TabPane)).apply(this,arguments))}return _inherits(TabPane,_React$Component3),_createClass(TabPane,[{key:"render",value:function(){var classList="tab-pane",title=void 0;return this.props.TabId===this.props.activeTab&&(classList+=" active"),this.props.Title&&(title=React.createElement("h1",null,this.props.Title)),React.createElement("div",{role:"tabpanel",className:classList,id:this.props.TabId},title,this.props.children)}}]),TabPane}(React.Component);TabPane.propTypes={TabId:React.PropTypes.string.isRequired,Title:React.PropTypes.string,activeTab:React.PropTypes.string},exports.Tabs=Tabs,exports.VerticalTabs=VerticalTabs,exports.TabPane=TabPane}]);
 //# sourceMappingURL=index.js.map
\ No newline at end of file
diff --git a/modules/candidate_parameters/jsx/CandidateInfo.js b/modules/candidate_parameters/jsx/CandidateInfo.js
index 19de8cf96f9..e207928ad0f 100644
--- a/modules/candidate_parameters/jsx/CandidateInfo.js
+++ b/modules/candidate_parameters/jsx/CandidateInfo.js
@@ -64,6 +64,34 @@ var CandidateInfo = React.createClass(
         formData: formData
       });
     },
+
+    addListItem: function(formElement, value, pendingValKey) {
+      var formData = this.state.formData;
+      var listItems = formData[formElement] || [];
+      listItems.push(value);
+      formData[formElement] = listItems;
+      formData[pendingValKey] = null;
+
+      this.setState({
+        formData: formData
+      });
+    },
+
+    removeListItem: function(formElement, value) {
+      var formData = this.state.formData;
+      var listItems = formData[formElement];
+      var index = listItems.indexOf(value);
+
+      if (index > -1) {
+        listItems.splice(index, 1);
+
+        formData[formElement] = listItems;
+        this.setState({
+          formData: formData
+        });
+      }
+    },
+
     onSubmit: function(e) {
       e.preventDefault();
     },
@@ -214,6 +242,15 @@ var CandidateInfo = React.createClass(
         }
       }
 
+      var snacks = {
+        1: 'Pretzel',
+        57: 'Goldfish',
+        15: 'Cheezball',
+        25: 'Gummi worm',
+        33: 'Bugle',
+        45: 'Fruit rollup',
+        102: 'Fruit by the foot'
+      };
       return (
         <div className="row">
           <div className={alertClass} role="alert" ref="alert-message">
@@ -252,6 +289,22 @@ var CandidateInfo = React.createClass(
               disabled={reasonDisabled}
               required={reasonRequired}
             />
+            <TagsElement
+              label="Favorite snacks?"
+              name="testList"
+              id="testList"
+              btnLabel="Add Snack"
+              useSearch={true}
+              strictSearch={true}
+              options={snacks}
+              items={this.state.formData.testList}
+              value={this.state.formData.pendingListItem}
+              required={true}
+              pendingValKey="pendingListItem"
+              onUserInput={this.setFormData}
+              onUserAdd={this.addListItem}
+              onUserRemove={this.removeListItem}
+            />
             {specifyOther}
             {extraParameterFields}
             {updateButton}
diff --git a/modules/candidate_parameters/jsx/ProbandInfo.js b/modules/candidate_parameters/jsx/ProbandInfo.js
index c856e49c80f..e0e0e001300 100644
--- a/modules/candidate_parameters/jsx/ProbandInfo.js
+++ b/modules/candidate_parameters/jsx/ProbandInfo.js
@@ -246,7 +246,7 @@ var ProbandInfo = React.createClass(
       }
 
       if (dob1 > today) {
-        alert("Consent to study date cannot be later than today!");
+        alert("Proband date of birth cannot be later than today!");
         return;
       }
 
diff --git a/modules/candidate_parameters/php/candidate_parameters.class.inc b/modules/candidate_parameters/php/candidate_parameters.class.inc
index 8692ebb6e55..e487e293818 100644
--- a/modules/candidate_parameters/php/candidate_parameters.class.inc
+++ b/modules/candidate_parameters/php/candidate_parameters.class.inc
@@ -52,12 +52,11 @@ class Candidate_Parameters extends \NDB_Form
     /**
      * Override default behaviour, since the page is loaded from index.js
      *
-     * @return void
-     * @access public
+     * @return string
      */
     function display()
     {
-        return null;
+        return "";
     }
 
     /**
diff --git a/modules/candidate_parameters/setup.md b/modules/candidate_parameters/setup.md
new file mode 100644
index 00000000000..1b183691c7a
--- /dev/null
+++ b/modules/candidate_parameters/setup.md
@@ -0,0 +1,60 @@
+#### Consent Status Tab - Additional Consents
+ 
+It is possible to have multiple consent types in the Consent Status tab. 
+In order to add consents, first make sure the useConsent option is set 
+to `true`, second follow the instructions below.
+ 
+1. Populate the config file with additional Consent tagsets. For example, 
+for consent to draw blood:
+
+    ```xml
+    <ConsentModule>
+        <useConsent>true</useConsent>
+        <Consent>
+            <name>study_consent</name>
+            <label>Consent to Study</label>
+        </Consent>
+        <Consent>
+            <name>draw_blood_consent</name>
+            <label>Consent to draw blood</label>
+        </Consent>
+    </ConsentModule>
+    ```
+2. Alter both `participant_status` and `consent_info_history` table schemas, 
+adding 3 columns for each new consent type, to store consent status, date and 
+withdrawal date. For example:
+    ```sql
+    ALTER TABLE participant_status ADD COLUMN draw_blood_consent enum('yes','no','not_answered');
+    ALTER TABLE participant_status ADD COLUMN draw_blood_consent_date date;
+    ALTER TABLE participant_status ADD COLUMN draw_blood_consent_withdrawal date;
+    ALTER TABLE consent_info_history ADD COLUMN draw_blood_consent enum('yes','no','not_answered');
+    ALTER TABLE consent_info_history ADD COLUMN draw_blood_consent_date date;
+    ALTER TABLE consent_info_history ADD COLUMN draw_blood_consent_withdrawal date;
+    ```
+
+#### Candidate Information Tab - Additional Parameters
+ 
+In addition to the Settings above, it is possible to add candidate parameters 
+to the Candidate Info page. To do so, values must be added in SQL following the 
+example below.
+
+Example:
+
+```sql
+INSERT INTO `parameter_type_category` (Name, Type) VALUES ('Candidate Parameters','Metavars');
+INSERT INTO parameter_type (Name, Type, Description, SourceFrom, Queryable) VALUES 
+  ('candidate_plan', "enum('6month', '12month')", 'Visit plan for candidate', 'parameter_candidate', 1);
+      
+INSERT INTO parameter_type_category_rel (ParameterTypeID, ParameterTypeCategoryID) SELECT 
+pt.ParameterTypeID, ptc.ParameterTypeCategoryID FROM parameter_type_category ptc, 
+parameter_type pt WHERE ptc.Name='Candidate Parameters' AND pt.Name='candidate_plan';
+```
+
+These queries will add a single additional dropdown with label _"Visit plan for candidate"_, 
+field name _"candidate_plan"_, and options _"6month"_, _"12month"_. 
+Values entered from the module in this field will be saved in the `parameter_candidate` 
+table in SQL. 
+
+_Note that the first query inserting into `parameter_type_category` is only required 
+the first time an addition to the Candidate Information_ tab is done, once that entry 
+is added the query does not need to be run again._
diff --git a/modules/configuration/README.md b/modules/configuration/README.md
new file mode 100644
index 00000000000..b7d82fca73d
--- /dev/null
+++ b/modules/configuration/README.md
@@ -0,0 +1,39 @@
+# Configuration
+
+## Purpose
+
+The configuration module is intended to provide a frontend for the
+configuration of a LORIS instance that has already been installed.
+
+## Intended Users
+
+The module is intended to be used by study administrators who need
+a front end interface for configuring LORIS for their study.
+
+## Scope
+
+The configuration module should only allow the configuration of
+study configuration, not LORIS installation parameters.
+
+## Permissions
+
+The permission named "config" is required in order to access this
+module.
+
+## Configurations
+
+None
+
+## Interactions with LORIS
+
+Describing the interactions of every configuration option that can
+be managed through the configuration module is beyond the scope of
+this document.
+
+However, the module mostly edits the LORIS MySQL `Config` table,
+which nearly every LORIS page interacts with through the `NDB_Config`
+class.
+
+Separate subpages manage the `project`, `subproject`, and
+`project_subproject_rel` tables for an administrator to be able to
+manage projects in LORIS without backend MySQL access.
diff --git a/modules/configuration/help/configuration.md b/modules/configuration/help/configuration.md
index 891c8529abe..37b6fc577e4 100644
--- a/modules/configuration/help/configuration.md
+++ b/modules/configuration/help/configuration.md
@@ -1,9 +1,20 @@
-# Configuration Module
+# Configuration
 
-The Configuration Module allows admin-level users to edit customized configuration settings from the front end of LORIS. (Any settings not currently in the Configuration Module are located in the <i>project/config.xml</i> file.)
+To edit any configuration settings, navigate to the field that you'd
+like to edit in the module, and edit or insert a new value.
 
-The Config Settings are organized into sections such as Study, Paths, WWW, etc.  An admin-level user can edit individual settings within each of these sections.
+Some configuration settings can accept multiple values. For these
+settings, you can add additional fields by pressing the "Add Field"
+button. This will create an empty form area where you can insert
+new values. You can delete any of the settings by pressing the red
+delete button attached to the form.
 
-Some configuration settings can accept multiple values.  For these settings, add/remove additional values using the "Add Field" and “Delete” buttons.
+Press the submit button at the bottom of the page to save your
+changes.  Pressing the submit button on a page will not save changes
+made on other pages.
+
+Care should be taken when editing the fields as there is currently
+no way to "undo" changes. You can reset the form to its values on
+page load by pressing the reset button. However, this will not undo
+any changes made before the submit button has been pressed.
 
-Click “Submit” at the bottom of each section to confirm and save any changes to settings in that section. You will see a brief success message “Submitted”, after changes are saved.\r\n\r\nCare should be taken when editing the fields as there is currently no way to revert changes once saved. To cancel any unsaved changes to configuration settings, click “Reset” to reload the section with the previously-stored values.
diff --git a/modules/conflict_resolver/php/conflict_resolver.class.inc b/modules/conflict_resolver/php/conflict_resolver.class.inc
index 33b82ce9c41..7a5129ff564 100644
--- a/modules/conflict_resolver/php/conflict_resolver.class.inc
+++ b/modules/conflict_resolver/php/conflict_resolver.class.inc
@@ -46,7 +46,7 @@ class Conflict_Resolver extends \NDB_Menu_Filter_Form
      *
      * @param array $values The values submitted from the form
      *
-     * @return none
+     * @return bool
      */
     function _process($values)
     {
@@ -179,7 +179,7 @@ class Conflict_Resolver extends \NDB_Menu_Filter_Form
      * Sets up the class variables required to render the query for the
      * conflict resolver
      *
-     * @return none
+     * @return void
      */
     function _setupVariables()
     {
@@ -318,7 +318,7 @@ class Conflict_Resolver extends \NDB_Menu_Filter_Form
     /**
      * Sets up the smarty menu filter items for the conflict resolver
      *
-     * @return none
+     * @return void
      */
     function setup()
     {
diff --git a/modules/conflict_resolver/php/resolved_conflicts.class.inc b/modules/conflict_resolver/php/resolved_conflicts.class.inc
index f5a51dc5c4f..32765236c95 100644
--- a/modules/conflict_resolver/php/resolved_conflicts.class.inc
+++ b/modules/conflict_resolver/php/resolved_conflicts.class.inc
@@ -45,7 +45,7 @@ class Resolved_Conflicts extends \NDB_Menu_Filter
     /**
      * Sets up the query for the resolved_conflicts submodule
      *
-     * @return none
+     * @return void
      */
     function _setupVariables()
     {
@@ -176,7 +176,7 @@ class Resolved_Conflicts extends \NDB_Menu_Filter
     /**
      * Adds the form elements required for the filter
      *
-     * @return none
+     * @return void
      */
     function setup()
     {
diff --git a/modules/create_timepoint/README.md b/modules/create_timepoint/README.md
new file mode 100644
index 00000000000..b43135f4e98
--- /dev/null
+++ b/modules/create_timepoint/README.md
@@ -0,0 +1,40 @@
+# Create Timepoint
+
+## Purpose
+
+The create timepoint module is intended to allow the creation of
+timepoints (also sometimes called "sessions" or "visits") for
+candidates within a LORIS module.
+
+## Intended Users
+
+The `create_timepoint` module is primarily used by data entry staff
+in order to create a new session prior to data entry. It may also
+be used by imaging staff in order to create a timepoint before
+uploading scans.
+
+## Scope
+
+The `create_timepoint` only creates the timepoint. It does not
+populate the test battery (which is done by the `next_stage` module.)
+
+## Permissions
+
+The module requires the user to have the `data_entry` permission
+as well as at least 1 study site.
+
+## Configurations
+
+The "useProjects" configuration affects whether or the available
+subprojects are restricted to the candidate's project related
+subprojects.
+
+The "visitLabel" setting in config.xml determines how the visit
+label for the timepoint is selected. However, this functionality
+is deprecated as text entry is unreliable.
+
+## Interactions with LORIS
+
+Users primarily access this module from the `candidate_list` .  Upon
+creating a timepoint, the module provides a link to the (empty)
+`instrument list` module for the new timepoint.
diff --git a/modules/create_timepoint/php/create_timepoint.class.inc b/modules/create_timepoint/php/create_timepoint.class.inc
index 4e6c74fcab5..7327076ba01 100644
--- a/modules/create_timepoint/php/create_timepoint.class.inc
+++ b/modules/create_timepoint/php/create_timepoint.class.inc
@@ -50,19 +50,6 @@ class Create_Timepoint extends \NDB_Form
         );
     }
 
-    /**
-     * Returns the form-specific defaults
-     *
-     * @return array
-     */
-    function _getDefaults()
-    {
-        $candidate =& \Candidate::singleton($this->identifier);
-
-        $defaults['visitLabel'] = $candidate->getNextVisitLabel();
-        return $defaults;
-    }
-
     /**
      * Processes the values and saves to database. Usually overridden
      * by form instance.
@@ -131,9 +118,9 @@ class Create_Timepoint extends \NDB_Form
 
         $attributes = array(
                        "onchange" => "location.href='?test_name=create_timepoint" .
-                        "&candID=" . $this->identifier .
-                        "&identifier=" . $this->identifier .
-                        "&subprojectID='+this[this.selectedIndex].value;",
+                "&candID=" . $this->identifier .
+                "&identifier=" . $this->identifier .
+                "&subprojectID='+this[this.selectedIndex].value;",
                       );
         $this->addSelect(
             'subprojectID',
@@ -149,34 +136,24 @@ class Create_Timepoint extends \NDB_Form
         $visitLabelAdded    = false;
 
         foreach (\Utility::toArray($visitLabelSettings) as $visitLabel) {
-            if ($visitLabel['@']['subprojectID']==$this->subprojectID) {
-                if ($visitLabel['generation'] == 'user') {
-                    error_log(
-                        "DEPRECATION WARNING: User generated visit labels will ".
-                        "no longer be supported in the next release of Loris. ".
-                        "Please add the necessary entries to the config.xml file ".
-                        "and set the generation to 'sequence'"
+            if ($visitLabel['@']['subprojectID'] == $this->subprojectID) {
+                if (isset($visitLabel['generation'])
+                    && $visitLabel['generation'] !== 'sequence'
+                ) {
+                    throw new \DeprecatedException(
+                        "User generated Visit Labels are no ".
+                        "longer supported in Loris."
                     );
-                    $this->addBasicText(
-                        'visitLabel',
-                        'Visit label',
-                        array(
-                         'size'      => $visitLabel['length'] + 1,
-                         'maxlength' => $visitLabel['length'],
-                        )
-                    );
-                    $visitLabelAdded = true;
-                } elseif ($visitLabel['generation'] == 'sequence') {
-                    $labelOptions[''] = null;
-                    $items            = \Utility::toArray(
-                        $visitLabel['labelSet']['item']
-                    );
-                    foreach ($items as $item) {
-                        $labelOptions[$item['@']['value']] = $item['#'];
-                    }
-                    $this->addSelect('visitLabel', 'Visit label', $labelOptions);
-                    $visitLabelAdded = true;
                 }
+                $labelOptions[''] = null;
+                $items            = \Utility::toArray(
+                    $visitLabel['labelSet']['item']
+                );
+                foreach ($items as $item) {
+                    $labelOptions[$item['@']['value']] = $item['#'];
+                }
+                $this->addSelect('visitLabel', 'Visit label', $labelOptions);
+                $visitLabelAdded = true;
             }
         }
 
@@ -188,8 +165,8 @@ class Create_Timepoint extends \NDB_Form
             $DB   = \Database::singleton();
             $user_list_of_sites = $user->getData('CenterIDs');
             $num_sites          = count($user_list_of_sites);
+            $psc_labelOptions   = array();
             if ($num_sites >1) {
-                $pscLabelAdded =true;
                 $this->tpl_data['pscLabelAdded'] = true;
                 $psc_labelOptions = array(null => '');
                 foreach ($user_list_of_sites as $key => $siteID) {
diff --git a/modules/create_timepoint/test/TestPlan b/modules/create_timepoint/test/TestPlan
index a83d6d839af..79f2e0d5629 100644
--- a/modules/create_timepoint/test/TestPlan
+++ b/modules/create_timepoint/test/TestPlan
@@ -3,25 +3,21 @@ Create Timepoint Test Plan:
 1. Access a candidate that does not have all timepoints from project created
    from Access Profile and click "Create time point"[Automation Testing]
 2. Choose a subproject from dropdown.[Manual Testing]
-   Ensure that page reloads with: 
-       a) subproject selected and also a list of visit labels if <labelSet> 
-       is set in the config.xml and a textbox otherwise
-       b) a site drop down only if the user belongs to more than one site
-3. If visit label is a textbox, ensure that an error appears if the <regex>
-   specified in the config file does not pass.[Manual Testing]
-4. Ensure that an error appears if the visit label already exists for the
+   Ensure that page reloads with subproject selected and also a list of visit
+   labels if <labelSet> is set in the config.xml.
+3. Ensure that an error appears if the visit label already exists for the
    candidate.[Manual Testing]
-5. Click create time point without choosing visit. Ensure there's an error.
+4. Click create time point without choosing visit. Ensure there's an error.
    [Automation Testing]
-6. Make sure the user belong to more than one site and click create time point 
+5. Make sure the user belong to more than one site and click create time point
 	without choosing a site. Ensure there's an error
-7. Choose visit label to be created and click "Create Time Point".
+6. Choose visit label to be created and click "Create Time Point".
    Ensure that you get a page saying creation was successful.
    Click on "Click here to continue" link and ensure that it brings you back
    to timepoint list page for that candidate (with new timepoint created)
    [Manual Testing]
-8. Repeat the steps above after creating a New Candidate.
+7. Repeat the steps above after creating a New Candidate.
    [Manual Testing]
-9. Check that page is inaccessible if either the user does not have data_entry
+8. Check that page is inaccessible if either the user does not have data_entry
    permission or the user and candidate are not the same site.
    [Manual Testing]
diff --git a/modules/create_timepoint/test/create_timepointTest.php b/modules/create_timepoint/test/create_timepointTest.php
index f7ec8f929b8..96cffec71a9 100644
--- a/modules/create_timepoint/test/create_timepointTest.php
+++ b/modules/create_timepoint/test/create_timepointTest.php
@@ -26,7 +26,7 @@
  */
 class CreateTimepointTestIntegrationTest extends LorisIntegrationTestWithCandidate
 {
-     /**
+    /**
      * It does the setUp before running the tests
      *
      * @return void
@@ -78,25 +78,30 @@ function testCreateTimepointDoespageLoad()
      */
     function testCreateTimepoint()
     {
-        $this->_createTimepoint('900000', 'subprojet 1', 'V1');
+        $this->_createTimepoint('900000', 'subprojet 1', 'V02');
         $bodyText = $this->webDriver->findElement(
             WebDriverBy::cssSelector("body")
         )->getText();
         $this->assertContains("New time point successfully registered", $bodyText);
 
     }
+
     /**
-     * Tests that, create a timepoint and input a error format visit label
-     * get Error message
+     * Tests that, create a timepoint and test the success link
      *
      * @return void
      */
-    function testCreateTimepointErrorVisitLabel()
+    function testCreateTimepointSuccessLink()
     {
-        $this->_createTimepoint('900000', 'subprojet 2', 'V9999');
+        $this->markTestSkipped(
+            'Skipping tests until create timepoint works well'
+        );
+
+        $this->_createTimepoint('900000', 'subprojet 1', 'V01');
+        $this->safeClick(WebDriverBy::LinkText("Click here to continue."));
         $bodyText = $this->webDriver->getPageSource();
         $this->assertContains(
-            "This visit label does not match the required structure.",
+            "List of Visits (Time Points)",
             $bodyText
         );
 
@@ -118,13 +123,14 @@ private function _createTimepoint($canID, $subproject, $visitlabel)
             "&identifier=" .$canID
         );
 
-        $select  = $this->safeFindElement(WebDriverBy::Name("subprojectID"));
-        $element = new WebDriverSelect($select);
-        $element->selectByVisibleText($subproject);
+        $selectSid  = $this->safeFindElement(WebDriverBy::Name("subprojectID"));
+        $elementSid = new WebDriverSelect($selectSid);
+        $elementSid->selectByVisibleText($subproject);
+
+        $selectVl  = $this->safeFindElement(WebDriverBy::Name("visitLabel"));
+        $elementVl = new WebDriverSelect($selectVl);
+        $elementVl->selectByVisibleText($visitlabel);
 
-        $this->webDriver->findElement(
-            WebDriverBy::Name("visitLabel")
-        )->sendKeys($visitlabel);
         $this->webDriver->findElement(
             WebDriverBy::Name("fire_away")
         )->click();
@@ -153,22 +159,22 @@ function testCreateTimepointErrorEmptySubproject()
 
     }
     /**
-      * Tests that timepoint loads with the permission
-      *
-      * @return void
-      */
+     * Tests that timepoint loads with the permission
+     *
+     * @return void
+     */
     public function testCreateTimepointPermission()
     {
-         $this->setupPermissions(array("data_entry"));
-         $this->safeGet(
-             $this->url . "/create_timepoint/?candID=900000&identifier=900000"
-         );
-         $bodyText = $this->webDriver->findElement(
-             WebDriverBy::cssSelector("body")
-         )->getText();
-
-         $this->assertNotContains("You do not have access to this page.", $bodyText);
-         $this->resetPermissions();
+        $this->setupPermissions(array("data_entry"));
+        $this->safeGet(
+            $this->url . "/create_timepoint/?candID=900000&identifier=900000"
+        );
+        $bodyText = $this->webDriver->findElement(
+            WebDriverBy::cssSelector("body")
+        )->getText();
+
+        $this->assertNotContains("You do not have access to this page.", $bodyText);
+        $this->resetPermissions();
     }
 }
 ?>
diff --git a/modules/data_integrity_flag/js/index.js b/modules/data_integrity_flag/js/index.js
index f892ba47d2b..03af060c3ca 100644
--- a/modules/data_integrity_flag/js/index.js
+++ b/modules/data_integrity_flag/js/index.js
@@ -1,2 +1,2 @@
-!function(modules){function __webpack_require__(moduleId){if(installedModules[moduleId])return installedModules[moduleId].exports;var module=installedModules[moduleId]={exports:{},id:moduleId,loaded:!1};return modules[moduleId].call(module.exports,module,module.exports,__webpack_require__),module.loaded=!0,module.exports}var installedModules={};return __webpack_require__.m=modules,__webpack_require__.c=installedModules,__webpack_require__.p="",__webpack_require__(0)}([function(module,exports,__webpack_require__){"use strict";function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}var _DataIntegrityFlag=__webpack_require__(10),_DataIntegrityFlag2=_interopRequireDefault(_DataIntegrityFlag);$(function(){var dataURL=loris.BaseURL+"/data_integrity_flag/?format=json",dataIntegrity=React.createElement("div",{id:"page-data-integrity"},React.createElement(_DataIntegrityFlag2.default,{Module:"data_integrity_flag",DataURL:dataURL}));ReactDOM.render(dataIntegrity,document.getElementById("lorisworkspace"))})},,function(module,exports){"use strict";function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}Object.defineProperty(exports,"__esModule",{value:!0});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),Panel=function(_React$Component){function Panel(props){_classCallCheck(this,Panel);var _this=_possibleConstructorReturn(this,(Panel.__proto__||Object.getPrototypeOf(Panel)).call(this,props));return _this.state={collapsed:_this.props.initCollapsed},_this.panelClass=_this.props.initCollapsed?"panel-collapse collapse":"panel-collapse collapse in",_this.toggleCollapsed=_this.toggleCollapsed.bind(_this),_this}return _inherits(Panel,_React$Component),_createClass(Panel,[{key:"toggleCollapsed",value:function(){this.setState({collapsed:!this.state.collapsed})}},{key:"render",value:function(){var glyphClass=this.state.collapsed?"glyphicon pull-right glyphicon-chevron-down":"glyphicon pull-right glyphicon-chevron-up",panelHeading=this.props.title?React.createElement("div",{className:"panel-heading",onClick:this.toggleCollapsed,"data-toggle":"collapse","data-target":"#"+this.props.id,style:{cursor:"pointer"}},this.props.title,React.createElement("span",{className:glyphClass})):"";return React.createElement("div",{className:"panel panel-primary"},panelHeading,React.createElement("div",{id:this.props.id,className:this.panelClass,role:"tabpanel"},React.createElement("div",{className:"panel-body",style:{height:this.props.height}},this.props.children)))}}]),Panel}(React.Component);Panel.propTypes={id:React.PropTypes.string,height:React.PropTypes.string,title:React.PropTypes.string},Panel.defaultProps={initCollapsed:!1,id:"default-panel",height:"100%"},exports.default=Panel},,,,,,,function(module,exports){"use strict";function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}Object.defineProperty(exports,"__esModule",{value:!0});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),Tabs=function(_React$Component){function Tabs(props){_classCallCheck(this,Tabs);var _this=_possibleConstructorReturn(this,(Tabs.__proto__||Object.getPrototypeOf(Tabs)).call(this,props)),hash=window.location.hash,activeTab="";return _this.props.updateURL&&hash?activeTab=hash.substr(1):_this.props.defaultTab?activeTab=_this.props.defaultTab:_this.props.tabs.length>0&&(activeTab=_this.props.tabs[0].id),_this.state={activeTab:activeTab},_this.handleClick=_this.handleClick.bind(_this),_this.getTabs=_this.getTabs.bind(_this),_this.getTabPanes=_this.getTabPanes.bind(_this),_this}return _inherits(Tabs,_React$Component),_createClass(Tabs,[{key:"handleClick",value:function(tabId,e){if(this.setState({activeTab:tabId}),this.props.onTabChange(tabId),this.props.updateURL){var scrollDistance=$("body").scrollTop()||$("html").scrollTop();window.location.hash=e.target.hash,$("html,body").scrollTop(scrollDistance)}}},{key:"getTabs",value:function(){var tabs=this.props.tabs.map(function(tab){var tabClass=this.state.activeTab===tab.id?"active":null,href="#"+tab.id,tabID="tab-"+tab.id;return React.createElement("li",{role:"presentation",className:tabClass,key:tab.id},React.createElement("a",{id:tabID,href:href,role:"tab","data-toggle":"tab",onClick:this.handleClick.bind(null,tab.id)},tab.label))}.bind(this));return tabs}},{key:"getTabPanes",value:function(){var tabPanes=React.Children.map(this.props.children,function(child,key){if(child)return React.cloneElement(child,{activeTab:this.state.activeTab,key:key})}.bind(this));return tabPanes}},{key:"render",value:function(){var tabs=this.getTabs(),tabPanes=this.getTabPanes(),tabStyle={marginLeft:0,marginBottom:"5px"};return React.createElement("div",null,React.createElement("ul",{className:"nav nav-tabs",role:"tablist",style:tabStyle},tabs),React.createElement("div",{className:"tab-content"},tabPanes))}}]),Tabs}(React.Component);Tabs.propTypes={tabs:React.PropTypes.array.isRequired,defaultTab:React.PropTypes.string,updateURL:React.PropTypes.bool},Tabs.defaultProps={onTabChange:function(){},updateURL:!1};var TabPane=function(_React$Component2){function TabPane(){return _classCallCheck(this,TabPane),_possibleConstructorReturn(this,(TabPane.__proto__||Object.getPrototypeOf(TabPane)).apply(this,arguments))}return _inherits(TabPane,_React$Component2),_createClass(TabPane,[{key:"render",value:function(){var classList="tab-pane",title=void 0;return this.props.TabId===this.props.activeTab&&(classList+=" active"),this.props.Title&&(title=React.createElement("h1",null,this.props.Title)),React.createElement("div",{role:"tabpanel",className:classList,id:this.props.TabId},title,this.props.children)}}]),TabPane}(React.Component);TabPane.propTypes={TabId:React.PropTypes.string.isRequired,Title:React.PropTypes.string,activeTab:React.PropTypes.string},exports.Tabs=Tabs,exports.TabPane=TabPane},function(module,exports,__webpack_require__){"use strict";function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}Object.defineProperty(exports,"__esModule",{value:!0});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),_SetFlagForm=__webpack_require__(11),_SetFlagForm2=_interopRequireDefault(_SetFlagForm),_columnFormatter=__webpack_require__(12),_columnFormatter2=_interopRequireDefault(_columnFormatter),_Tabs=__webpack_require__(9),_FilterForm=__webpack_require__(13),_FilterForm2=_interopRequireDefault(_FilterForm),DataIntegrityFlag=function(_React$Component){function DataIntegrityFlag(props){_classCallCheck(this,DataIntegrityFlag);var _this=_possibleConstructorReturn(this,(DataIntegrityFlag.__proto__||Object.getPrototypeOf(DataIntegrityFlag)).call(this,props));return _this.state={isLoaded:!1,filter:{},formData:{}},_this.fetchData=_this.fetchData.bind(_this),_this.updateFilter=_this.updateFilter.bind(_this),_this}return _inherits(DataIntegrityFlag,_React$Component),_createClass(DataIntegrityFlag,[{key:"componentDidMount",value:function(){this.fetchData()}},{key:"fetchData",value:function(){var _this2=this;$.getJSON(this.props.DataURL,function(data){loris.flagStatusList=data.flagStatusList,_this2.setState({Data:data,isLoaded:!0})}).error(function(error){console.error(error)})}},{key:"updateFilter",value:function(filter){this.setState({filter:filter})}},{key:"render",value:function(){if(!this.state.isLoaded)return React.createElement("button",{className:"btn-info has-spinner"},"Loading",React.createElement("span",{className:"glyphicon glyphicon-refresh glyphicon-refresh-animate"}));var tabList=[{id:"browse",label:"Browse"},{id:"setflag",label:"Update"}];return React.createElement(_Tabs.Tabs,{tabs:tabList,defaultTab:"browse",updateURL:!0},React.createElement(_Tabs.TabPane,{TabId:tabList[0].id},React.createElement(_FilterForm2.default,{Module:this.props.Module,name:"data_integrity_filter",id:"data_integrity_filter",columns:2,onUpdate:this.updateFilter,filter:this.state.filter},React.createElement(SelectElement,{name:"visitLabel",label:"Visit Label",options:this.state.Data.visits}),React.createElement(SelectElement,{name:"instrument",label:"Instrument",options:this.state.Data.instruments}),React.createElement(SelectElement,{name:"userID",label:"User",options:this.state.Data.users}),React.createElement(SelectElement,{name:"flagStatus",label:"Flag Status",options:this.state.Data.flagStatusList}),React.createElement(ButtonElement,{label:"Clear Filters",type:"reset"})),React.createElement(StaticDataTable,{Data:this.state.Data.Data,Headers:this.state.Data.Headers,Filter:this.state.filter,getFormattedCell:_columnFormatter2.default})),React.createElement(_Tabs.TabPane,{TabId:tabList[1].id},React.createElement(_SetFlagForm2.default,{visits:this.state.Data.visits,instruments:this.state.Data.instruments,flagStatusList:this.state.Data.flagStatusList,updateData:this.fetchData})))}}]),DataIntegrityFlag}(React.Component);exports.default=DataIntegrityFlag},function(module,exports){"use strict";function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}Object.defineProperty(exports,"__esModule",{value:!0});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),SetFlagForm=function(_React$Component){function SetFlagForm(props){_classCallCheck(this,SetFlagForm);var _this=_possibleConstructorReturn(this,(SetFlagForm.__proto__||Object.getPrototypeOf(SetFlagForm)).call(this,props));return _this.state={formData:{}},_this.setFormData=_this.setFormData.bind(_this),_this.handleSubmit=_this.handleSubmit.bind(_this),_this}return _inherits(SetFlagForm,_React$Component),_createClass(SetFlagForm,[{key:"setFormData",value:function(formElement,value){var formData=JSON.parse(JSON.stringify(this.state.formData));formData[formElement]=value,this.setState({formData:formData})}},{key:"handleSubmit",value:function(e){e.preventDefault(),$.ajax({type:"POST",url:"/data_integrity_flag/",data:JSON.stringify(this.state.formData),cache:!1,contentType:!1,processData:!1,success:function(data){swal({title:"Success!",type:"success"}),this.props.updateData(),this.setState({formData:{}})}.bind(this),error:function(err){console.error(err),swal({title:"Error!",type:"error",content:err.statusText})}})}},{key:"render",value:function(){return React.createElement("div",{className:"col-md-8 col-lg-6"},React.createElement(FormElement,{name:"flag_form",onSubmit:this.handleSubmit},React.createElement("h3",{className:"text-center"},"Update Instrument Status"),React.createElement("br",null),React.createElement(SelectElement,{name:"visitLabel",label:"Visit Label",options:this.props.visits,onUserInput:this.setFormData,value:this.state.formData.visitLabel,required:!0}),React.createElement(SelectElement,{name:"instrument",label:"Instrument",options:this.props.instruments,onUserInput:this.setFormData,value:this.state.formData.instrument,required:!0}),React.createElement(DateElement,{name:"date",label:"Date",onUserInput:this.setFormData,value:this.state.formData.date,required:!0}),React.createElement(SelectElement,{name:"flagStatus",label:"Flag Status",options:this.props.flagStatusList,onUserInput:this.setFormData,value:this.state.formData.flagStatus,required:!0}),React.createElement(TextareaElement,{name:"comment",label:"Comment",onUserInput:this.setFormData,value:this.state.formData.comment}),React.createElement(ButtonElement,{label:"Update"})))}}]),SetFlagForm}(React.Component);SetFlagForm.propTypes={},SetFlagForm.defaultProps={},exports.default=SetFlagForm},function(module,exports){"use strict";function formatColumn(column,cell,rowData,rowHeaders){if(loris.hiddenHeaders.indexOf(column)>-1)return null;var row={};if(rowHeaders.forEach(function(header,index){row[header]=rowData[index]},this),"Instrument"===column){var url=loris.BaseURL+"/data_team_helper/?visit_label="+row["Visit Label"]+"&instrument="+row.Instrument;return React.createElement("td",null,React.createElement("a",{href:url},cell))}if("Flag Status"===column){var statusList=loris.flagStatusList;return Object.keys(statusList).length>0&&statusList[cell]?React.createElement("td",null,statusList[cell]):React.createElement("td",null,cell)}return React.createElement("td",null,cell)}Object.defineProperty(exports,"__esModule",{value:!0}),loris.hiddenHeaders=[],exports.default=formatColumn},function(module,exports,__webpack_require__){"use strict";function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}Object.defineProperty(exports,"__esModule",{value:!0});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),_Panel=__webpack_require__(2),_Panel2=_interopRequireDefault(_Panel),FilterForm=function(_React$Component){function FilterForm(props){_classCallCheck(this,FilterForm);var _this=_possibleConstructorReturn(this,(FilterForm.__proto__||Object.getPrototypeOf(FilterForm)).call(this,props));return _this.clearFilter=_this.clearFilter.bind(_this),_this.getFormChildren=_this.getFormChildren.bind(_this),_this.setFilter=_this.setFilter.bind(_this),_this.onElementUpdate=_this.onElementUpdate.bind(_this),_this.queryString=QueryString.get(),_this}return _inherits(FilterForm,_React$Component),_createClass(FilterForm,[{key:"componentDidMount",value:function(){var filter={},queryString=this.queryString;Object.keys(queryString).forEach(function(key){var filterKey="candidateID"===key?"candID":key;filter[filterKey]={value:queryString[key],exactMatch:!1}}),this.props.onUpdate(filter)}},{key:"clearFilter",value:function(){this.queryString=QueryString.clear(this.props.Module),this.props.onUpdate({})}},{key:"getFormChildren",value:function(){var formChildren=[];return React.Children.forEach(this.props.children,function(child,key){if(React.isValidElement(child)&&"function"==typeof child.type&&child.props.onUserInput){var callbackFunc=child.props.onUserInput,callbackName=callbackFunc.name,elementName=child.type.displayName,queryFieldName="candID"===child.props.name?"candidateID":child.props.name,filterValue=this.queryString[queryFieldName];"onUserInput"===callbackName&&(callbackFunc="ButtonElement"===elementName&&"reset"===child.props.type?this.clearFilter:this.onElementUpdate.bind(null,elementName)),formChildren.push(React.cloneElement(child,{onUserInput:callbackFunc,value:filterValue?filterValue:"",key:key})),this.setFilter(elementName,child.props.name,filterValue)}else formChildren.push(React.cloneElement(child,{key:key}))}.bind(this)),formChildren}},{key:"setFilter",value:function(type,key,value){var filter={};return this.props.filter&&(filter=JSON.parse(JSON.stringify(this.props.filter))),key&&value?(filter[key]={},filter[key].value=value,filter[key].exactMatch="SelectElement"===type):filter&&key&&""===value&&delete filter[key],filter}},{key:"onElementUpdate",value:function(type,fieldName,fieldValue){if("string"==typeof fieldName&&"string"==typeof fieldValue){var queryFieldName="candID"===fieldName?"candidateID":fieldName;this.queryString=QueryString.set(this.queryString,queryFieldName,fieldValue);var filter=this.setFilter(type,fieldName,fieldValue);this.props.onUpdate(filter)}}},{key:"render",value:function(){var formChildren=this.getFormChildren(),formElements=this.props.formElements;return formElements&&Object.keys(formElements).forEach(function(fieldName){var queryFieldName="candID"===fieldName?"candidateID":fieldName;formElements[fieldName].onUserInput=this.onElementUpdate.bind(null,fieldName),formElements[fieldName].value=this.queryString[queryFieldName]}.bind(this)),React.createElement(_Panel2.default,{id:this.props.id,height:this.props.height,title:this.props.title},React.createElement(FormElement,this.props,formChildren))}}]),FilterForm}(React.Component);FilterForm.defaultProps={id:"selection-filter",height:"100%",title:"Selection Filter",onUpdate:function(){console.warn("onUpdate() callback is not set!")}},FilterForm.propTypes={Module:React.PropTypes.string.isRequired,filter:React.PropTypes.object.isRequired,id:React.PropTypes.string,height:React.PropTypes.string,title:React.PropTypes.string,onUpdate:React.PropTypes.func},exports.default=FilterForm}]);
+!function(modules){function __webpack_require__(moduleId){if(installedModules[moduleId])return installedModules[moduleId].exports;var module=installedModules[moduleId]={exports:{},id:moduleId,loaded:!1};return modules[moduleId].call(module.exports,module,module.exports,__webpack_require__),module.loaded=!0,module.exports}var installedModules={};return __webpack_require__.m=modules,__webpack_require__.c=installedModules,__webpack_require__.p="",__webpack_require__(0)}([function(module,exports,__webpack_require__){"use strict";function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}var _DataIntegrityFlag=__webpack_require__(10),_DataIntegrityFlag2=_interopRequireDefault(_DataIntegrityFlag);$(function(){var dataURL=loris.BaseURL+"/data_integrity_flag/?format=json",dataIntegrity=React.createElement("div",{id:"page-data-integrity"},React.createElement(_DataIntegrityFlag2.default,{Module:"data_integrity_flag",DataURL:dataURL}));ReactDOM.render(dataIntegrity,document.getElementById("lorisworkspace"))})},,function(module,exports){"use strict";function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}Object.defineProperty(exports,"__esModule",{value:!0});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),Panel=function(_React$Component){function Panel(props){_classCallCheck(this,Panel);var _this=_possibleConstructorReturn(this,(Panel.__proto__||Object.getPrototypeOf(Panel)).call(this,props));return _this.state={collapsed:_this.props.initCollapsed},_this.panelClass=_this.props.initCollapsed?"panel-collapse collapse":"panel-collapse collapse in",_this.toggleCollapsed=_this.toggleCollapsed.bind(_this),_this}return _inherits(Panel,_React$Component),_createClass(Panel,[{key:"toggleCollapsed",value:function(){this.setState({collapsed:!this.state.collapsed})}},{key:"render",value:function(){var glyphClass=this.state.collapsed?"glyphicon pull-right glyphicon-chevron-down":"glyphicon pull-right glyphicon-chevron-up",panelHeading=this.props.title?React.createElement("div",{className:"panel-heading",onClick:this.toggleCollapsed,"data-toggle":"collapse","data-target":"#"+this.props.id,style:{cursor:"pointer"}},this.props.title,React.createElement("span",{className:glyphClass})):"";return React.createElement("div",{className:"panel panel-primary"},panelHeading,React.createElement("div",{id:this.props.id,className:this.panelClass,role:"tabpanel"},React.createElement("div",{className:"panel-body",style:{height:this.props.height}},this.props.children)))}}]),Panel}(React.Component);Panel.propTypes={id:React.PropTypes.string,height:React.PropTypes.string,title:React.PropTypes.string},Panel.defaultProps={initCollapsed:!1,id:"default-panel",height:"100%"},exports.default=Panel},,,,,,,function(module,exports){"use strict";function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}Object.defineProperty(exports,"__esModule",{value:!0});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),Tabs=function(_React$Component){function Tabs(props){_classCallCheck(this,Tabs);var _this=_possibleConstructorReturn(this,(Tabs.__proto__||Object.getPrototypeOf(Tabs)).call(this,props)),hash=window.location.hash,activeTab="";return _this.props.updateURL&&hash?activeTab=hash.substr(1):_this.props.defaultTab?activeTab=_this.props.defaultTab:_this.props.tabs.length>0&&(activeTab=_this.props.tabs[0].id),_this.state={activeTab:activeTab},_this.handleClick=_this.handleClick.bind(_this),_this.getTabs=_this.getTabs.bind(_this),_this.getTabPanes=_this.getTabPanes.bind(_this),_this}return _inherits(Tabs,_React$Component),_createClass(Tabs,[{key:"handleClick",value:function(tabId,e){if(this.setState({activeTab:tabId}),this.props.onTabChange(tabId),this.props.updateURL){var scrollDistance=$("body").scrollTop()||$("html").scrollTop();window.location.hash=e.target.hash,$("html,body").scrollTop(scrollDistance)}}},{key:"getTabs",value:function(){var tabs=this.props.tabs.map(function(tab){var tabClass=this.state.activeTab===tab.id?"active":null,href="#"+tab.id,tabID="tab-"+tab.id;return React.createElement("li",{role:"presentation",className:tabClass,key:tab.id},React.createElement("a",{id:tabID,href:href,role:"tab","data-toggle":"tab",onClick:this.handleClick.bind(null,tab.id)},tab.label))}.bind(this));return tabs}},{key:"getTabPanes",value:function(){var tabPanes=React.Children.map(this.props.children,function(child,key){if(child)return React.cloneElement(child,{activeTab:this.state.activeTab,key:key})}.bind(this));return tabPanes}},{key:"render",value:function(){var tabs=this.getTabs(),tabPanes=this.getTabPanes(),tabStyle={marginLeft:0,marginBottom:"5px"};return React.createElement("div",null,React.createElement("ul",{className:"nav nav-tabs",role:"tablist",style:tabStyle},tabs),React.createElement("div",{className:"tab-content"},tabPanes))}}]),Tabs}(React.Component);Tabs.propTypes={tabs:React.PropTypes.array.isRequired,defaultTab:React.PropTypes.string,updateURL:React.PropTypes.bool},Tabs.defaultProps={onTabChange:function(){},updateURL:!0};var VerticalTabs=function(_React$Component2){function VerticalTabs(props){_classCallCheck(this,VerticalTabs);var _this2=_possibleConstructorReturn(this,(VerticalTabs.__proto__||Object.getPrototypeOf(VerticalTabs)).call(this,props)),hash=window.location.hash,activeTab="";return _this2.props.updateURL&&hash?activeTab=hash.substr(1):_this2.props.defaultTab?activeTab=_this2.props.defaultTab:_this2.props.tabs.length>0&&(activeTab=_this2.props.tabs[0].id),_this2.state={activeTab:activeTab},_this2.handleClick=_this2.handleClick.bind(_this2),_this2.getTabs=_this2.getTabs.bind(_this2),_this2.getTabPanes=_this2.getTabPanes.bind(_this2),_this2}return _inherits(VerticalTabs,_React$Component2),_createClass(VerticalTabs,[{key:"handleClick",value:function(tabId,e){if(this.setState({activeTab:tabId}),this.props.onTabChange(tabId),this.props.updateURL){var scrollDistance=$("body").scrollTop()||$("html").scrollTop();window.location.hash=e.target.hash,$("html,body").scrollTop(scrollDistance)}}},{key:"getTabs",value:function(){var tabs=this.props.tabs.map(function(tab){var tabClass=this.state.activeTab===tab.id?"active":null,href="#"+tab.id,tabID="tab-"+tab.id;return React.createElement("li",{role:"presentation",className:tabClass,key:tab.id},React.createElement("a",{id:tabID,href:href,role:"tab","data-toggle":"tab",onClick:this.handleClick.bind(null,tab.id)},tab.label))}.bind(this));return tabs}},{key:"getTabPanes",value:function(){var tabPanes=React.Children.map(this.props.children,function(child,key){if(child)return React.cloneElement(child,{activeTab:this.state.activeTab,key:key})}.bind(this));return tabPanes}},{key:"render",value:function(){var tabs=this.getTabs(),tabPanes=this.getTabPanes(),tabStyle={marginLeft:0,marginBottom:"5px"};return React.createElement("div",null,React.createElement("div",{className:"tabbable col-md-3 col-sm-3"},React.createElement("ul",{className:"nav nav-pills nav-stacked",role:"tablist",style:tabStyle},tabs)),React.createElement("div",{className:"tab-content col-md-9 col-sm-9"},tabPanes))}}]),VerticalTabs}(React.Component);VerticalTabs.propTypes={tabs:React.PropTypes.array.isRequired,defaultTab:React.PropTypes.string,updateURL:React.PropTypes.bool},VerticalTabs.defaultProps={onTabChange:function(){},updateURL:!0};var TabPane=function(_React$Component3){function TabPane(){return _classCallCheck(this,TabPane),_possibleConstructorReturn(this,(TabPane.__proto__||Object.getPrototypeOf(TabPane)).apply(this,arguments))}return _inherits(TabPane,_React$Component3),_createClass(TabPane,[{key:"render",value:function(){var classList="tab-pane",title=void 0;return this.props.TabId===this.props.activeTab&&(classList+=" active"),this.props.Title&&(title=React.createElement("h1",null,this.props.Title)),React.createElement("div",{role:"tabpanel",className:classList,id:this.props.TabId},title,this.props.children)}}]),TabPane}(React.Component);TabPane.propTypes={TabId:React.PropTypes.string.isRequired,Title:React.PropTypes.string,activeTab:React.PropTypes.string},exports.Tabs=Tabs,exports.VerticalTabs=VerticalTabs,exports.TabPane=TabPane},function(module,exports,__webpack_require__){"use strict";function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}Object.defineProperty(exports,"__esModule",{value:!0});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),_SetFlagForm=__webpack_require__(11),_SetFlagForm2=_interopRequireDefault(_SetFlagForm),_columnFormatter=__webpack_require__(12),_columnFormatter2=_interopRequireDefault(_columnFormatter),_Tabs=__webpack_require__(9),_FilterForm=__webpack_require__(13),_FilterForm2=_interopRequireDefault(_FilterForm),DataIntegrityFlag=function(_React$Component){function DataIntegrityFlag(props){_classCallCheck(this,DataIntegrityFlag);var _this=_possibleConstructorReturn(this,(DataIntegrityFlag.__proto__||Object.getPrototypeOf(DataIntegrityFlag)).call(this,props));return _this.state={isLoaded:!1,filter:{},formData:{}},_this.fetchData=_this.fetchData.bind(_this),_this.updateFilter=_this.updateFilter.bind(_this),_this}return _inherits(DataIntegrityFlag,_React$Component),_createClass(DataIntegrityFlag,[{key:"componentDidMount",value:function(){this.fetchData()}},{key:"fetchData",value:function(){var _this2=this;$.getJSON(this.props.DataURL,function(data){loris.flagStatusList=data.flagStatusList,_this2.setState({Data:data,isLoaded:!0})}).error(function(error){console.error(error)})}},{key:"updateFilter",value:function(filter){this.setState({filter:filter})}},{key:"render",value:function(){if(!this.state.isLoaded)return React.createElement("button",{className:"btn-info has-spinner"},"Loading",React.createElement("span",{className:"glyphicon glyphicon-refresh glyphicon-refresh-animate"}));var tabList=[{id:"browse",label:"Browse"},{id:"setflag",label:"Update"}];return React.createElement(_Tabs.Tabs,{tabs:tabList,defaultTab:"browse",updateURL:!0},React.createElement(_Tabs.TabPane,{TabId:tabList[0].id},React.createElement(_FilterForm2.default,{Module:this.props.Module,name:"data_integrity_filter",id:"data_integrity_filter",columns:2,onUpdate:this.updateFilter,filter:this.state.filter},React.createElement(SelectElement,{name:"visitLabel",label:"Visit Label",options:this.state.Data.visits}),React.createElement(SelectElement,{name:"instrument",label:"Instrument",options:this.state.Data.instruments}),React.createElement(SelectElement,{name:"userID",label:"User",options:this.state.Data.users}),React.createElement(SelectElement,{name:"flagStatus",label:"Flag Status",options:this.state.Data.flagStatusList}),React.createElement(ButtonElement,{label:"Clear Filters",type:"reset"})),React.createElement(StaticDataTable,{Data:this.state.Data.Data,Headers:this.state.Data.Headers,Filter:this.state.filter,getFormattedCell:_columnFormatter2.default})),React.createElement(_Tabs.TabPane,{TabId:tabList[1].id},React.createElement(_SetFlagForm2.default,{visits:this.state.Data.visits,instruments:this.state.Data.instruments,flagStatusList:this.state.Data.flagStatusList,updateData:this.fetchData})))}}]),DataIntegrityFlag}(React.Component);exports.default=DataIntegrityFlag},function(module,exports){"use strict";function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}Object.defineProperty(exports,"__esModule",{value:!0});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),SetFlagForm=function(_React$Component){function SetFlagForm(props){_classCallCheck(this,SetFlagForm);var _this=_possibleConstructorReturn(this,(SetFlagForm.__proto__||Object.getPrototypeOf(SetFlagForm)).call(this,props));return _this.state={formData:{}},_this.setFormData=_this.setFormData.bind(_this),_this.handleSubmit=_this.handleSubmit.bind(_this),_this}return _inherits(SetFlagForm,_React$Component),_createClass(SetFlagForm,[{key:"setFormData",value:function(formElement,value){var formData=JSON.parse(JSON.stringify(this.state.formData));formData[formElement]=value,this.setState({formData:formData})}},{key:"handleSubmit",value:function(e){e.preventDefault(),$.ajax({type:"POST",url:"/data_integrity_flag/",data:JSON.stringify(this.state.formData),cache:!1,contentType:!1,processData:!1,success:function(data){swal({title:"Success!",type:"success"}),this.props.updateData(),this.setState({formData:{}})}.bind(this),error:function(err){console.error(err),swal({title:"Error!",type:"error",content:err.statusText})}})}},{key:"render",value:function(){return React.createElement("div",{className:"col-md-8 col-lg-6"},React.createElement(FormElement,{name:"flag_form",onSubmit:this.handleSubmit},React.createElement("h3",{className:"text-center"},"Update Instrument Status"),React.createElement("br",null),React.createElement(SelectElement,{name:"visitLabel",label:"Visit Label",options:this.props.visits,onUserInput:this.setFormData,value:this.state.formData.visitLabel,required:!0}),React.createElement(SelectElement,{name:"instrument",label:"Instrument",options:this.props.instruments,onUserInput:this.setFormData,value:this.state.formData.instrument,required:!0}),React.createElement(DateElement,{name:"date",label:"Date",onUserInput:this.setFormData,value:this.state.formData.date,required:!0}),React.createElement(SelectElement,{name:"flagStatus",label:"Flag Status",options:this.props.flagStatusList,onUserInput:this.setFormData,value:this.state.formData.flagStatus,required:!0}),React.createElement(TextareaElement,{name:"comment",label:"Comment",onUserInput:this.setFormData,value:this.state.formData.comment}),React.createElement(ButtonElement,{label:"Update"})))}}]),SetFlagForm}(React.Component);SetFlagForm.propTypes={},SetFlagForm.defaultProps={},exports.default=SetFlagForm},function(module,exports){"use strict";function formatColumn(column,cell,rowData,rowHeaders){if(loris.hiddenHeaders.indexOf(column)>-1)return null;var row={};if(rowHeaders.forEach(function(header,index){row[header]=rowData[index]},this),"Instrument"===column){var url=loris.BaseURL+"/data_team_helper/?visit_label="+row["Visit Label"]+"&instrument="+row.Instrument;return React.createElement("td",null,React.createElement("a",{href:url},cell))}if("Flag Status"===column){var statusList=loris.flagStatusList;return Object.keys(statusList).length>0&&statusList[cell]?React.createElement("td",null,statusList[cell]):React.createElement("td",null,cell)}return React.createElement("td",null,cell)}Object.defineProperty(exports,"__esModule",{value:!0}),loris.hiddenHeaders=[],exports.default=formatColumn},function(module,exports,__webpack_require__){"use strict";function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}Object.defineProperty(exports,"__esModule",{value:!0});var _typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(obj){return typeof obj}:function(obj){return obj&&"function"==typeof Symbol&&obj.constructor===Symbol&&obj!==Symbol.prototype?"symbol":typeof obj},_createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),_Panel=__webpack_require__(2),_Panel2=_interopRequireDefault(_Panel),FilterForm=function(_React$Component){function FilterForm(props){_classCallCheck(this,FilterForm);var _this=_possibleConstructorReturn(this,(FilterForm.__proto__||Object.getPrototypeOf(FilterForm)).call(this,props));return _this.clearFilter=_this.clearFilter.bind(_this),_this.getFormChildren=_this.getFormChildren.bind(_this),_this.setFilter=_this.setFilter.bind(_this),_this.onElementUpdate=_this.onElementUpdate.bind(_this),_this.queryString=QueryString.get(),_this}return _inherits(FilterForm,_React$Component),_createClass(FilterForm,[{key:"componentDidMount",value:function(){var filter={},queryString=this.queryString;Object.keys(queryString).forEach(function(key){var filterKey="candidateID"===key?"candID":key;filter[filterKey]={value:queryString[key],exactMatch:!1}}),this.props.onUpdate(filter)}},{key:"clearFilter",value:function(){this.queryString=QueryString.clear(this.props.Module),this.props.onUpdate({})}},{key:"getFormChildren",value:function(){var formChildren=[];return React.Children.forEach(this.props.children,function(child,key){if(React.isValidElement(child)&&"function"==typeof child.type&&child.props.onUserInput){var callbackFunc=child.props.onUserInput,callbackName=callbackFunc.name,elementName=child.type.displayName,queryFieldName="candID"===child.props.name?"candidateID":child.props.name,filterValue=this.queryString[queryFieldName];"onUserInput"===callbackName&&(callbackFunc="ButtonElement"===elementName&&"reset"===child.props.type?this.clearFilter:this.onElementUpdate.bind(null,elementName)),formChildren.push(React.cloneElement(child,{onUserInput:callbackFunc,value:filterValue?filterValue:"",key:key})),this.setFilter(elementName,child.props.name,filterValue)}else formChildren.push(React.cloneElement(child,{key:key}))}.bind(this)),formChildren}},{key:"setFilter",value:function(type,key,value){var filter={};return this.props.filter&&(filter=JSON.parse(JSON.stringify(this.props.filter))),key?(filter[key]={},0===value.length?filter[key].value="":key&&value&&(filter[key].value=value),filter[key].exactMatch="SelectElement"===type):filter&&key&&""===value&&delete filter[key],filter}},{key:"onElementUpdate",value:function(type,fieldName,fieldValue){if("string"==typeof fieldName&&("string"==typeof fieldValue||"object"===("undefined"==typeof fieldValue?"undefined":_typeof(fieldValue)))){var queryFieldName="candID"===fieldName?"candidateID":fieldName;this.queryString=QueryString.set(this.queryString,queryFieldName,fieldValue);var filter=this.setFilter(type,fieldName,fieldValue);this.props.onUpdate(filter)}}},{key:"render",value:function(){var formChildren=this.getFormChildren(),formElements=this.props.formElements;return formElements&&Object.keys(formElements).forEach(function(fieldName){var queryFieldName="candID"===fieldName?"candidateID":fieldName;formElements[fieldName].onUserInput=this.onElementUpdate.bind(null,fieldName),formElements[fieldName].value=this.queryString[queryFieldName]}.bind(this)),React.createElement(_Panel2.default,{id:this.props.id,height:this.props.height,title:this.props.title},React.createElement(FormElement,this.props,formChildren))}}]),FilterForm}(React.Component);FilterForm.defaultProps={id:"selection-filter",height:"100%",title:"Selection Filter",onUpdate:function(){console.warn("onUpdate() callback is not set!")}},FilterForm.propTypes={Module:React.PropTypes.string.isRequired,filter:React.PropTypes.object.isRequired,id:React.PropTypes.string,height:React.PropTypes.string,title:React.PropTypes.string,onUpdate:React.PropTypes.func},exports.default=FilterForm}]);
 //# sourceMappingURL=index.js.map
\ No newline at end of file
diff --git a/modules/data_integrity_flag/php/data_integrity_flag.class.inc b/modules/data_integrity_flag/php/data_integrity_flag.class.inc
index 9bff973f17e..8559c9f48fd 100644
--- a/modules/data_integrity_flag/php/data_integrity_flag.class.inc
+++ b/modules/data_integrity_flag/php/data_integrity_flag.class.inc
@@ -44,8 +44,7 @@ class Data_Integrity_Flag extends \NDB_Menu_Filter
     /**
      * Displays the menu page
      *
-     * @return void
-     * @access public
+     * @return string
      */
     function display()
     {
@@ -106,7 +105,7 @@ class Data_Integrity_Flag extends \NDB_Menu_Filter
     /**
      * Build a list of media to display in Data Table
      *
-     * @return bool
+     * @return void
      * @throws \DatabaseException
      */
     function _setupVariables()
@@ -144,7 +143,7 @@ class Data_Integrity_Flag extends \NDB_Menu_Filter
      * Converts the results of this menu filter to a JSON format to be retrieved
      * with ?format=json
      *
-     * @return a json encoded string of the headers and data from this table
+     * @return string a json encoded string of the headers and data from this table
      */
     function toJSON()
     {
diff --git a/modules/data_release/README.md b/modules/data_release/README.md
index f5206222bbf..cb0b2e15866 100644
--- a/modules/data_release/README.md
+++ b/modules/data_release/README.md
@@ -1,14 +1,14 @@
-#Data Release Module
+# Data Release Module
 
 The Data Release Module can be used to easily distribute packaged data releases of your study.
 
-##Features:
+## Features:
 
 - Upload new releases through the front-end web interface
 - Differentiate releases using (optionally unique) versioning tag
 - Assign permissions for each release to any specific user
 
-##Other notes:
+## Other notes:
 
 - Uploads are stored under the modules/data_release/user_uploads directory which can easily be symlinked to another location if necessary, but please create and make sure it is writable by your web server
 - Only superusers have permission to upload files and grant permissions
diff --git a/modules/data_release/php/data_release.class.inc b/modules/data_release/php/data_release.class.inc
index 7d31ea70845..6a0236253ee 100644
--- a/modules/data_release/php/data_release.class.inc
+++ b/modules/data_release/php/data_release.class.inc
@@ -29,7 +29,7 @@ class Data_Release extends \NDB_Menu_Filter
     /**
      * Setup variables
      *
-     * @return None
+     * @return void
      */
     function _setupVariables()
     {
diff --git a/modules/data_release/user_uploads/.gitignore b/modules/data_release/user_uploads/.gitignore
new file mode 100644
index 00000000000..72e8ffc0db8
--- /dev/null
+++ b/modules/data_release/user_uploads/.gitignore
@@ -0,0 +1 @@
+*
diff --git a/modules/data_team_helper/README.md b/modules/data_team_helper/README.md
new file mode 100644
index 00000000000..550bcd9faf0
--- /dev/null
+++ b/modules/data_team_helper/README.md
@@ -0,0 +1,31 @@
+# Data Team Helper
+
+## Purpose
+
+The Data Team Helper module is intended to provide a dashboard to
+make it easier for the data entry staff of a LORIS project to access
+all the unfinished data entry.
+
+## Scope
+
+The data team helper provides links to unfinished data in other
+LORIS modules in a centralized place. In particular, it links to
+open feedback, unresolved conflict, and candidate instruments where
+the data entry (or double data entry) has not yet been completed.
+
+## Permissions
+
+Accessing the module requires the `data_team_helper` permission.
+
+## Configurations
+
+There are no configurations for this module.
+
+## Interactions with LORIS
+
+The Data Team Helper module links to the feedback module, the
+conflict resolver, and the data entry for particular instruments.
+
+Note: The Data Team Helper module is listed as "Quality Control"
+in the default LORIS menu.
+
diff --git a/modules/data_team_helper/php/data_team_helper.class.inc b/modules/data_team_helper/php/data_team_helper.class.inc
index ea3b65eca60..411949d0320 100644
--- a/modules/data_team_helper/php/data_team_helper.class.inc
+++ b/modules/data_team_helper/php/data_team_helper.class.inc
@@ -42,7 +42,7 @@ class Data_Team_Helper extends \NDB_Form
     /**
      * Sets up main parameters
      *
-     * @return NULL
+     * @return void
      */
     function setup()
     {
diff --git a/modules/datadict/README b/modules/datadict/README
deleted file mode 100644
index 8e055eb93e8..00000000000
--- a/modules/datadict/README
+++ /dev/null
@@ -1,4 +0,0 @@
-The data dictionary module is used for viewing and modifying the parameter_type
-table which contains LORIS's data dictionary. If the user has the data_dict_edit
-permission, they are able to override the description to customize the data
-dictionary
diff --git a/modules/datadict/README.md b/modules/datadict/README.md
new file mode 100644
index 00000000000..2c3e8d5a4dd
--- /dev/null
+++ b/modules/datadict/README.md
@@ -0,0 +1,51 @@
+# Data Dictionary
+
+## Purpose
+
+The data dictionary module is used for viewing and modifying the
+LORIS data dictionary descriptions.
+
+## Scope
+
+The module displays and manages the data dictionary for fields
+already stored in the LORIS `parameter_type` table. This table is
+generally autopopulated and provides a dictionary for imaging headers
+(populated by the imaging pipeline) and behavioural instrument
+(populated by the `lorisform_parser.php` script).
+
+It does not provide a way to enter new fields into the data dictionary,
+or describe the data dictionary for arbitrary SQL fields which are
+not stored in the `parameter_type` table, such as instrument flags
+or candidate/session data.
+
+## Permission
+
+The `data_dict_view` permission allows the user to view the LORIS
+data dictionary.
+
+The `data_dict_edit` permission allows the user to both view, and
+modify the description of, rows in the data dictionary.
+
+## Configuration
+
+The `parameter_type` table must be populated to use this module.
+The data comes from two sources:
+
+1. The LORIS imaging pipeline scripts, which must be setup separately
+2. The `tools/data_dictionary_builder.php` script, which loads the
+   behavioural data dictionary based on the `ip_output.txt` file created
+   by `tools/lorisform_parser.php`
+
+## Interactions with LORIS
+
+The content for the data dictionary module comes from the
+`parameter_type` table.
+
+Modified entries are saved in the separate `parameter_type_override`
+table, and the "data dictionary" used by LORIS is the coalesce of
+the two tables, with `parameter_type_override` taking priority.
+This allows the `parameter_type` table itself to be regenerated
+when instruments change without losing the user modified values.
+
+The data query module uses the customized data dictionary descriptions
+from this module.
diff --git a/modules/datadict/php/datadict.class.inc b/modules/datadict/php/datadict.class.inc
index 44cba982845..123f818fe31 100644
--- a/modules/datadict/php/datadict.class.inc
+++ b/modules/datadict/php/datadict.class.inc
@@ -46,8 +46,7 @@ class Datadict extends \NDB_Menu_Filter
     * Setup variables function
     *
     * @note   Setup variables function
-    * @return bool
-    * @access private
+    * @return void
     */
     function _setupVariables()
     {
@@ -84,7 +83,7 @@ class Datadict extends \NDB_Menu_Filter
     /**
     * Set Filter Form
     *
-    * @return none
+    * @return void
     */
     function setup()
     {
diff --git a/modules/dataquery/ajax/GetDoc.php b/modules/dataquery/ajax/GetDoc.php
index d8bf1415f20..7bbeddd4db4 100644
--- a/modules/dataquery/ajax/GetDoc.php
+++ b/modules/dataquery/ajax/GetDoc.php
@@ -21,8 +21,16 @@
 $client->initialize(__DIR__ . "/../../../project/config.xml");
 header("Content-Type: application/json");
 
-$cdb   = \NDB_Factory::singleton()->couchDB();
-$docID = urlencode($_REQUEST['DocID']);
+$config      = \NDB_Config::singleton();
+$couchConfig = $config->getSetting('CouchDB');
+$cdb         = \NDB_Factory::singleton()->couchDB(
+    $couchConfig['dbName'],
+    $couchConfig['hostname'],
+    $couchConfig['port'],
+    $couchConfig['admin'],
+    $couchConfig['adminpass']
+);
+$docID       = urlencode($_REQUEST['DocID']);
 
 $results = $cdb->getDoc(
     $docID
diff --git a/modules/dataquery/ajax/datadictionary.php b/modules/dataquery/ajax/datadictionary.php
index 0d904681df1..2856ddaf6bd 100644
--- a/modules/dataquery/ajax/datadictionary.php
+++ b/modules/dataquery/ajax/datadictionary.php
@@ -20,7 +20,15 @@
 $client->makeCommandLine();
 $client->initialize(__DIR__ . "/../../../project/config.xml");
 
-$cdb = \NDB_Factory::singleton()->couchDB();
+$config      = \NDB_Config::singleton();
+$couchConfig = $config->getSetting('CouchDB');
+$cdb         = \NDB_Factory::singleton()->couchDB(
+    $couchConfig['dbName'],
+    $couchConfig['hostname'],
+    $couchConfig['port'],
+    $couchConfig['admin'],
+    $couchConfig['adminpass']
+);
 
 if ($_REQUEST['category']) {
     $category = urlencode($_REQUEST['category']);
diff --git a/modules/dataquery/ajax/getAllSessions.php b/modules/dataquery/ajax/getAllSessions.php
index 80b25a6ba61..99aff5a8bbd 100644
--- a/modules/dataquery/ajax/getAllSessions.php
+++ b/modules/dataquery/ajax/getAllSessions.php
@@ -19,7 +19,15 @@
 $client = new NDB_Client();
 $client->makeCommandLine();
 $client->initialize(__DIR__ . "/../../../project/config.xml");
-$cdb            = \NDB_Factory::singleton()->couchDB();
+$config         = \NDB_Config::singleton();
+$couchConfig    = $config->getSetting('CouchDB');
+$cdb            = \NDB_Factory::singleton()->couchDB(
+    $couchConfig['dbName'],
+    $couchConfig['hostname'],
+    $couchConfig['port'],
+    $couchConfig['admin'],
+    $couchConfig['adminpass']
+);
 $results        = $cdb->queryView(
     "DQG-2.0",
     "sessions",
diff --git a/modules/dataquery/ajax/queryContains.php b/modules/dataquery/ajax/queryContains.php
index 09b3bfb8036..308d9148726 100644
--- a/modules/dataquery/ajax/queryContains.php
+++ b/modules/dataquery/ajax/queryContains.php
@@ -19,7 +19,15 @@
 $client = new NDB_Client();
 $client->makeCommandLine();
 $client->initialize(__DIR__ . "/../../../project/config.xml");
-$cdb            = \NDB_Factory::singleton()->couchDB();
+$config         = \NDB_Config::singleton();
+$couchConfig    = $config->getSetting('CouchDB');
+$cdb            = \NDB_Factory::singleton()->couchDB(
+    $couchConfig['dbName'],
+    $couchConfig['hostname'],
+    $couchConfig['port'],
+    $couchConfig['admin'],
+    $couchConfig['adminpass']
+);
 $category       = $_REQUEST['category'];
 $fieldName      = $_REQUEST['field'];
 $value          = $_REQUEST['value'];
diff --git a/modules/dataquery/ajax/queryEqual.php b/modules/dataquery/ajax/queryEqual.php
index 3c6fdf4c3fd..87a31357584 100644
--- a/modules/dataquery/ajax/queryEqual.php
+++ b/modules/dataquery/ajax/queryEqual.php
@@ -19,10 +19,18 @@
 $client = new NDB_Client();
 $client->makeCommandLine();
 $client->initialize(__DIR__ . "/../../../project/config.xml");
-$cdb       = \NDB_Factory::singleton()->couchDB();
-$category  = $_REQUEST['category'];
-$fieldName = $_REQUEST['field'];
-$value     = $_REQUEST['value'];
+$config      = \NDB_Config::singleton();
+$couchConfig = $config->getSetting('CouchDB');
+$cdb         = \NDB_Factory::singleton()->couchDB(
+    $couchConfig['dbName'],
+    $couchConfig['hostname'],
+    $couchConfig['port'],
+    $couchConfig['admin'],
+    $couchConfig['adminpass']
+);
+$category    = $_REQUEST['category'];
+$fieldName   = $_REQUEST['field'];
+$value       = $_REQUEST['value'];
 
 if (!is_numeric($value) && $value !== "null") {
     $value = "\"$value\"";
diff --git a/modules/dataquery/ajax/queryGreaterThanEqual.php b/modules/dataquery/ajax/queryGreaterThanEqual.php
index 63b096926d0..2ac49ef7e6d 100644
--- a/modules/dataquery/ajax/queryGreaterThanEqual.php
+++ b/modules/dataquery/ajax/queryGreaterThanEqual.php
@@ -20,11 +20,19 @@
 $client->makeCommandLine();
 $client->initialize(__DIR__ . "/../../../project/config.xml");
 
-$cdb       = \NDB_Factory::singleton()->couchDB();
-$category  = $_REQUEST['category'];
-$fieldName = $_REQUEST['field'];
-$value     = $_REQUEST['value'];
-$value     = is_numeric($value) ? $value : "\"$value\"";
+$config      = \NDB_Config::singleton();
+$couchConfig = $config->getSetting('CouchDB');
+$cdb         = \NDB_Factory::singleton()->couchDB(
+    $couchConfig['dbName'],
+    $couchConfig['hostname'],
+    $couchConfig['port'],
+    $couchConfig['admin'],
+    $couchConfig['adminpass']
+);
+$category    = $_REQUEST['category'];
+$fieldName   = $_REQUEST['field'];
+$value       = $_REQUEST['value'];
+$value       = is_numeric($value) ? $value : "\"$value\"";
 
 $results = $cdb->queryView(
     "DQG-2.0",
diff --git a/modules/dataquery/ajax/queryLessThanEqual.php b/modules/dataquery/ajax/queryLessThanEqual.php
index 97a8bce1d6f..9f107a2f0d4 100644
--- a/modules/dataquery/ajax/queryLessThanEqual.php
+++ b/modules/dataquery/ajax/queryLessThanEqual.php
@@ -19,11 +19,19 @@
 $client = new NDB_Client();
 $client->makeCommandLine();
 $client->initialize(__DIR__ . "/../../../project/config.xml");
-$cdb       = \NDB_Factory::singleton()->couchDB();
-$category  = $_REQUEST['category'];
-$fieldName = $_REQUEST['field'];
-$value     = $_REQUEST['value'];
-$value     = is_numeric($value) ? $value : "\"$value\"";
+$config      = \NDB_Config::singleton();
+$couchConfig = $config->getSetting('CouchDB');
+$cdb         = \NDB_Factory::singleton()->couchDB(
+    $couchConfig['dbName'],
+    $couchConfig['hostname'],
+    $couchConfig['port'],
+    $couchConfig['admin'],
+    $couchConfig['adminpass']
+);
+$category    = $_REQUEST['category'];
+$fieldName   = $_REQUEST['field'];
+$value       = $_REQUEST['value'];
+$value       = is_numeric($value) ? $value : "\"$value\"";
 
 $results = $cdb->queryView(
     "DQG-2.0",
diff --git a/modules/dataquery/ajax/queryNotEqual.php b/modules/dataquery/ajax/queryNotEqual.php
index 04f8fcef47c..d57823d736f 100644
--- a/modules/dataquery/ajax/queryNotEqual.php
+++ b/modules/dataquery/ajax/queryNotEqual.php
@@ -19,10 +19,18 @@
 $client = new NDB_Client();
 $client->makeCommandLine();
 $client->initialize(__DIR__ . "/../../../project/config.xml");
-$cdb       = \NDB_Factory::singleton()->couchDB();
-$category  = $_REQUEST['category'];
-$fieldName = $_REQUEST['field'];
-$value     = $_REQUEST['value'];
+$config      = \NDB_Config::singleton();
+$couchConfig = $config->getSetting('CouchDB');
+$cdb         = \NDB_Factory::singleton()->couchDB(
+    $couchConfig['dbName'],
+    $couchConfig['hostname'],
+    $couchConfig['port'],
+    $couchConfig['admin'],
+    $couchConfig['adminpass']
+);
+$category    = $_REQUEST['category'];
+$fieldName   = $_REQUEST['field'];
+$value       = $_REQUEST['value'];
 // There's no way to do "not" in an index, so we need to
 // get all the values of the field name, and then iterate
 // through them and exclude the ones where the value is
diff --git a/modules/dataquery/ajax/queryStartsWith.php b/modules/dataquery/ajax/queryStartsWith.php
index 2ef99e36418..04d2d1d7f6a 100644
--- a/modules/dataquery/ajax/queryStartsWith.php
+++ b/modules/dataquery/ajax/queryStartsWith.php
@@ -19,11 +19,19 @@
 $client = new NDB_Client();
 $client->makeCommandLine();
 $client->initialize(__DIR__ . "/../../../project/config.xml");
-$cdb       = \NDB_Factory::singleton()->couchDB();
-$category  = $_REQUEST['category'];
-$fieldName = $_REQUEST['field'];
-$value     = $_REQUEST['value'];
-$results   = $cdb->queryView(
+$config      = \NDB_Config::singleton();
+$couchConfig = $config->getSetting('CouchDB');
+$cdb         = \NDB_Factory::singleton()->couchDB(
+    $couchConfig['dbName'],
+    $couchConfig['hostname'],
+    $couchConfig['port'],
+    $couchConfig['admin'],
+    $couchConfig['adminpass']
+);
+$category    = $_REQUEST['category'];
+$fieldName   = $_REQUEST['field'];
+$value       = $_REQUEST['value'];
+$results     = $cdb->queryView(
     "DQG-2.0",
     "search",
     array(
diff --git a/modules/dataquery/ajax/retrieveCategoryDocs.php b/modules/dataquery/ajax/retrieveCategoryDocs.php
index 973e353e827..909a4fc535e 100644
--- a/modules/dataquery/ajax/retrieveCategoryDocs.php
+++ b/modules/dataquery/ajax/retrieveCategoryDocs.php
@@ -20,10 +20,18 @@
 $client = new NDB_Client();
 $client->makeCommandLine();
 $client->initialize(__DIR__ . "/../../../project/config.xml");
-$cdb      = \NDB_Factory::singleton()->couchDB();
-$category = $_REQUEST['DocType'];
-$sessions = json_decode($_REQUEST['Sessions']);
-$keys     = array_map(
+$config      = \NDB_Config::singleton();
+$couchConfig = $config->getSetting('CouchDB');
+$cdb         = \NDB_Factory::singleton()->couchDB(
+    $couchConfig['dbName'],
+    $couchConfig['hostname'],
+    $couchConfig['port'],
+    $couchConfig['admin'],
+    $couchConfig['adminpass']
+);
+$category    = $_REQUEST['DocType'];
+$sessions    = json_decode($_REQUEST['Sessions']);
+$keys        = array_map(
     function ($row) use ($category) {
         return array_merge(array($category), $row);
     },
diff --git a/modules/dataquery/ajax/saveQuery.php b/modules/dataquery/ajax/saveQuery.php
index e43afbe3919..b1467f40335 100644
--- a/modules/dataquery/ajax/saveQuery.php
+++ b/modules/dataquery/ajax/saveQuery.php
@@ -21,9 +21,17 @@
 $client->makeCommandLine();
 $client->initialize(__DIR__ . "/../../../project/config.xml");
 
-$user = User::singleton();
-$cdb  = \NDB_Factory::singleton()->couchDB();
-$qid  = $user->getUserName() . "_" . $_REQUEST['QueryName'];
+$user        = User::singleton();
+$config      = \NDB_Config::singleton();
+$couchConfig = $config->getSetting('CouchDB');
+$cdb         = \NDB_Factory::singleton()->couchDB(
+    $couchConfig['dbName'],
+    $couchConfig['hostname'],
+    $couchConfig['port'],
+    $couchConfig['admin'],
+    $couchConfig['adminpass']
+);
+$qid         = $user->getUserName() . "_" . $_REQUEST['QueryName'];
 
 if ($_REQUEST['SharedQuery'] === "true") {
     $qid = "global:" . $qid;
diff --git a/modules/dataquery/help/dataquery.md b/modules/dataquery/help/dataquery.md
index 07dfd5d31a6..7d38e16d54d 100644
--- a/modules/dataquery/help/dataquery.md
+++ b/modules/dataquery/help/dataquery.md
@@ -1,5 +1,44 @@
 # Data Querying Module
 
-This module implements a proxy to pass through queries to the Loris CouchDB DQT tool.
+## Purpose
+
+The LORIS data querying module ("the DQT") provides a graphical
+frontend for scientists to query and extract arbitrary data from a
+LORIS instances without backend SQL access.
+
+## Intended Users
+
+The DQT is intended for scientists who are internal to the LORIS
+project to extract data.
+
+## Scope
+
+The Data Querying Module implements a proxy to pass through queries
+to the Loris CouchDB DQT backend, which must be setup independently
+(see Configuration section).
+
+It does **NOT** alter data in any way other than that required to
+convert the data from the MySQL to the CouchDB format. In particular,
+it does no anonymization or filtering of participant data that is
+already in LORIS. This must be done independently before distributing
+data externally.
+
+## Permission
+
+The DQT requires the `dataquery_view` permission.
+
+## Configuration
+
+CouchDB must be independently setup, and the relevant CouchDB views
+installed following the directions at
+https://github.com/aces/Data-Query-Tool.
+
+Importer scripts must be set up to import data into CouchDB. (The
+instructions are also in the README of the above repository.)
+
+## Interactions with LORIS
+
+The CouchDB import scripts (those named `CouchDB_Import_*.php` in
+the LORIS tools directory) must be run to import data from MySQL
+to CouchDB before the DQT can be used.
 
-It assumes the CouchDB server and import scripts are already set up.
diff --git a/modules/dataquery/php/dataquery.class.inc b/modules/dataquery/php/dataquery.class.inc
index 95398560a67..52655009326 100644
--- a/modules/dataquery/php/dataquery.class.inc
+++ b/modules/dataquery/php/dataquery.class.inc
@@ -47,9 +47,17 @@ class Dataquery extends \NDB_Form
     {
         parent::setup();
 
-        $user     = \User::singleton();
-        $username = $user->getUsername();
-        $couch    = \NDB_Factory::singleton()->couchDB();
+        $user        = \User::singleton();
+        $username    = $user->getUsername();
+        $config      = \NDB_Config::singleton();
+        $couchConfig = $config->getSetting('CouchDB');
+        $couch       = \NDB_Factory::singleton()->couchDB(
+            $couchConfig['dbName'],
+            $couchConfig['hostname'],
+            $couchConfig['port'],
+            $couchConfig['admin'],
+            $couchConfig['adminpass']
+        );
 
         $update = $couch->queryView(
             "DQG-2.0",
diff --git a/modules/dicom_archive/README.md b/modules/dicom_archive/README.md
new file mode 100644
index 00000000000..2fcea9858b2
--- /dev/null
+++ b/modules/dicom_archive/README.md
@@ -0,0 +1,57 @@
+# Dicom Archive
+
+## Purpose
+
+The DICOM Archive module provides a front end to view the metadata
+about DICOM studies and series that have been registered in the
+LORIS database via the first step of the imaging pipeline (using
+`dicomTar.pl`). Protocol checks and QC are performed later on and not
+represented in this module.
+
+## Intended Users
+
+The DICOM Archive is primarily used by DCC staff who are investigating
+the status of imaging pipeline scripts.
+
+## Scope
+
+The DICOM Archive shows DICOM tar metadata. It does not provide a
+way to visualize scans or view metadata of other data formats. It
+provides a frontend to the `tarchive_*` tables in LORIS, but does
+not directly inspect files on the filesystem. However, DICOM 
+files can be downloaded through the frontend and inspected on a 
+user's system.
+
+
+## Permissions
+
+The permission `dicom_archive_view_allsites` is required to access
+the DICOM Archive module.
+
+## Configurations
+
+The `patientNameRegex`, `LegoPhantomRegex`, and `LivingPhantomRegex`
+configuration variables provide regular expressions to ensure that
+the DICOM has been properly anonymized. If at least one of these
+isn't matched, the Patient Name is displayed as "INVALID - HIDDEN".
+By default, when the regex is blank (such as in a default LORIS
+install), all patient names are shown.
+
+The `patientIDRegex` configuration has a similar purpose for the
+Patient ID column.
+
+The `showTransferStatus` configuration option is obsolete and should
+not be used, but determines if a first "Transfer Status" column
+appears in the menu table.
+
+For downloading large DICOM files, it may be necessary to increase the 
+ value of the `memory_limit` configuration option within `php.ini`.
+ 
+
+## Interactions with LORIS
+
+The tarchive tables used by the DICOM archive must be populated by
+the imaging `dicomTar.pl` script before there is any data in the module.
+
+The menu for the DICOM Archive module links to the imaging browser
+module, for scans which have been successfully inserted.
diff --git a/modules/dicom_archive/help/dicom_archive.md b/modules/dicom_archive/help/dicom_archive.md
index 6aa34200524..50bf2b08ed8 100644
--- a/modules/dicom_archive/help/dicom_archive.md
+++ b/modules/dicom_archive/help/dicom_archive.md
@@ -12,3 +12,6 @@ Clicking on the "View Details" link in the Metadata column will take you
 to a page displaying more details of every scan and clicking on "View Images"
 in the MRI Browser column will take you to the session containing those
 images in the LORIS imaging browser.
+
+Clicking on the "Archive Location" link will begin a download of the scans'
+DICOMs.
\ No newline at end of file
diff --git a/modules/dicom_archive/js/dicom_archive.js b/modules/dicom_archive/js/dicom_archive.js
index d22c66ec233..7060bbb433f 100644
--- a/modules/dicom_archive/js/dicom_archive.js
+++ b/modules/dicom_archive/js/dicom_archive.js
@@ -1,2 +1,2 @@
-!function(modules){function __webpack_require__(moduleId){if(installedModules[moduleId])return installedModules[moduleId].exports;var module=installedModules[moduleId]={exports:{},id:moduleId,loaded:!1};return modules[moduleId].call(module.exports,module,module.exports,__webpack_require__),module.loaded=!0,module.exports}var installedModules={};return __webpack_require__.m=modules,__webpack_require__.c=installedModules,__webpack_require__.p="",__webpack_require__(0)}({0:function(module,exports,__webpack_require__){"use strict";function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),_FilterForm=__webpack_require__(13),_FilterForm2=_interopRequireDefault(_FilterForm),_columnFormatter=__webpack_require__(14),_columnFormatter2=_interopRequireDefault(_columnFormatter),DicomArchive=function(_React$Component){function DicomArchive(props){_classCallCheck(this,DicomArchive);var _this=_possibleConstructorReturn(this,(DicomArchive.__proto__||Object.getPrototypeOf(DicomArchive)).call(this,props));return _this.state={isLoaded:!1,filter:{}},_this.fetchData=_this.fetchData.bind(_this),_this.updateFilter=_this.updateFilter.bind(_this),_this.resetFilters=_this.resetFilters.bind(_this),_this}return _inherits(DicomArchive,_React$Component),_createClass(DicomArchive,[{key:"componentDidMount",value:function(){this.fetchData()}},{key:"fetchData",value:function(){$.ajax(this.props.DataURL,{method:"GET",dataType:"json",success:function(data){loris.hiddenHeaders=data.hiddenHeaders?data.hiddenHeaders:[],this.setState({Data:data,isLoaded:!0})}.bind(this),error:function(_error){console.error(_error)}})}},{key:"updateFilter",value:function(filter){this.setState({filter:filter})}},{key:"resetFilters",value:function(){this.refs.dicomFilter.clearFilter()}},{key:"render",value:function(){return this.state.isLoaded?React.createElement("div",null,React.createElement(_FilterForm2.default,{Module:"dicom_archive",name:"dicom_filter",id:"dicom_filter",ref:"dicomFilter",columns:2,formElements:this.state.Data.form,onUpdate:this.updateFilter,filter:this.state.filter},React.createElement(ButtonElement,{label:"Clear Filters",type:"reset",onUserInput:this.resetFilters})),React.createElement(StaticDataTable,{Data:this.state.Data.Data,Headers:this.state.Data.Headers,Filter:this.state.filter,getFormattedCell:_columnFormatter2.default})):React.createElement("button",{className:"btn-info has-spinner"},"Loading",React.createElement("span",{className:"glyphicon glyphicon-refresh glyphicon-refresh-animate"}))}}]),DicomArchive}(React.Component);DicomArchive.propTypes={Module:React.PropTypes.string.isRequired,DataURL:React.PropTypes.string.isRequired},window.onload=function(){var dataURL=loris.BaseURL+"/dicom_archive/?format=json",dicomArchive=React.createElement(DicomArchive,{Module:"dicom_archive",DataURL:dataURL}),dicomArchiveDOM=document.createElement("div");dicomArchiveDOM.id="page-dicom-archive";var rootDOM=document.getElementById("lorisworkspace");rootDOM.appendChild(dicomArchiveDOM),ReactDOM.render(dicomArchive,document.getElementById("page-dicom-archive"))}},2:function(module,exports){"use strict";function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}Object.defineProperty(exports,"__esModule",{value:!0});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),Panel=function(_React$Component){function Panel(props){_classCallCheck(this,Panel);var _this=_possibleConstructorReturn(this,(Panel.__proto__||Object.getPrototypeOf(Panel)).call(this,props));return _this.state={collapsed:_this.props.initCollapsed},_this.panelClass=_this.props.initCollapsed?"panel-collapse collapse":"panel-collapse collapse in",_this.toggleCollapsed=_this.toggleCollapsed.bind(_this),_this}return _inherits(Panel,_React$Component),_createClass(Panel,[{key:"toggleCollapsed",value:function(){this.setState({collapsed:!this.state.collapsed})}},{key:"render",value:function(){var glyphClass=this.state.collapsed?"glyphicon pull-right glyphicon-chevron-down":"glyphicon pull-right glyphicon-chevron-up",panelHeading=this.props.title?React.createElement("div",{className:"panel-heading",onClick:this.toggleCollapsed,"data-toggle":"collapse","data-target":"#"+this.props.id,style:{cursor:"pointer"}},this.props.title,React.createElement("span",{className:glyphClass})):"";return React.createElement("div",{className:"panel panel-primary"},panelHeading,React.createElement("div",{id:this.props.id,className:this.panelClass,role:"tabpanel"},React.createElement("div",{className:"panel-body",style:{height:this.props.height}},this.props.children)))}}]),Panel}(React.Component);Panel.propTypes={id:React.PropTypes.string,height:React.PropTypes.string,title:React.PropTypes.string},Panel.defaultProps={initCollapsed:!1,id:"default-panel",height:"100%"},exports.default=Panel},13:function(module,exports,__webpack_require__){"use strict";function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}Object.defineProperty(exports,"__esModule",{value:!0});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),_Panel=__webpack_require__(2),_Panel2=_interopRequireDefault(_Panel),FilterForm=function(_React$Component){function FilterForm(props){_classCallCheck(this,FilterForm);var _this=_possibleConstructorReturn(this,(FilterForm.__proto__||Object.getPrototypeOf(FilterForm)).call(this,props));return _this.clearFilter=_this.clearFilter.bind(_this),_this.getFormChildren=_this.getFormChildren.bind(_this),_this.setFilter=_this.setFilter.bind(_this),_this.onElementUpdate=_this.onElementUpdate.bind(_this),_this.queryString=QueryString.get(),_this}return _inherits(FilterForm,_React$Component),_createClass(FilterForm,[{key:"componentDidMount",value:function(){var filter={},queryString=this.queryString;Object.keys(queryString).forEach(function(key){var filterKey="candidateID"===key?"candID":key;filter[filterKey]={value:queryString[key],exactMatch:!1}}),this.props.onUpdate(filter)}},{key:"clearFilter",value:function(){this.queryString=QueryString.clear(this.props.Module),this.props.onUpdate({})}},{key:"getFormChildren",value:function(){var formChildren=[];return React.Children.forEach(this.props.children,function(child,key){if(React.isValidElement(child)&&"function"==typeof child.type&&child.props.onUserInput){var callbackFunc=child.props.onUserInput,callbackName=callbackFunc.name,elementName=child.type.displayName,queryFieldName="candID"===child.props.name?"candidateID":child.props.name,filterValue=this.queryString[queryFieldName];"onUserInput"===callbackName&&(callbackFunc="ButtonElement"===elementName&&"reset"===child.props.type?this.clearFilter:this.onElementUpdate.bind(null,elementName)),formChildren.push(React.cloneElement(child,{onUserInput:callbackFunc,value:filterValue?filterValue:"",key:key})),this.setFilter(elementName,child.props.name,filterValue)}else formChildren.push(React.cloneElement(child,{key:key}))}.bind(this)),formChildren}},{key:"setFilter",value:function(type,key,value){var filter={};return this.props.filter&&(filter=JSON.parse(JSON.stringify(this.props.filter))),key&&value?(filter[key]={},filter[key].value=value,filter[key].exactMatch="SelectElement"===type):filter&&key&&""===value&&delete filter[key],filter}},{key:"onElementUpdate",value:function(type,fieldName,fieldValue){if("string"==typeof fieldName&&"string"==typeof fieldValue){var queryFieldName="candID"===fieldName?"candidateID":fieldName;this.queryString=QueryString.set(this.queryString,queryFieldName,fieldValue);var filter=this.setFilter(type,fieldName,fieldValue);this.props.onUpdate(filter)}}},{key:"render",value:function(){var formChildren=this.getFormChildren(),formElements=this.props.formElements;return formElements&&Object.keys(formElements).forEach(function(fieldName){var queryFieldName="candID"===fieldName?"candidateID":fieldName;formElements[fieldName].onUserInput=this.onElementUpdate.bind(null,fieldName),formElements[fieldName].value=this.queryString[queryFieldName]}.bind(this)),React.createElement(_Panel2.default,{id:this.props.id,height:this.props.height,title:this.props.title},React.createElement(FormElement,this.props,formChildren))}}]),FilterForm}(React.Component);FilterForm.defaultProps={id:"selection-filter",height:"100%",title:"Selection Filter",onUpdate:function(){console.warn("onUpdate() callback is not set!")}},FilterForm.propTypes={Module:React.PropTypes.string.isRequired,filter:React.PropTypes.object.isRequired,id:React.PropTypes.string,height:React.PropTypes.string,title:React.PropTypes.string,onUpdate:React.PropTypes.func},exports.default=FilterForm},14:function(module,exports){"use strict";function formatColumn(column,cell,rowData,rowHeaders){if(loris.hiddenHeaders.indexOf(column)>-1)return null;var row={};if(rowHeaders.forEach(function(header,index){row[header]=rowData[index]},this),"Metadata"===column){var metadataURL=loris.BaseURL+"/dicom_archive/viewDetails/?tarchiveID="+row.TarchiveID;return React.createElement("td",null,React.createElement("a",{href:metadataURL},cell))}if("MRI Browser"===column){if(null===row.SessionID||""===row.SessionID)return React.createElement("td",null," ");var mrlURL=loris.BaseURL+"/imaging_browser/viewSession/?sessionID="+row.SessionID;return React.createElement("td",null,React.createElement("a",{href:mrlURL},cell))}return"INVALID - HIDDEN"===cell?React.createElement("td",{className:"text-danger"},cell):React.createElement("td",null,cell)}Object.defineProperty(exports,"__esModule",{value:!0}),window.formatColumn=formatColumn,exports.default=formatColumn}});
+!function(modules){function __webpack_require__(moduleId){if(installedModules[moduleId])return installedModules[moduleId].exports;var module=installedModules[moduleId]={exports:{},id:moduleId,loaded:!1};return modules[moduleId].call(module.exports,module,module.exports,__webpack_require__),module.loaded=!0,module.exports}var installedModules={};return __webpack_require__.m=modules,__webpack_require__.c=installedModules,__webpack_require__.p="",__webpack_require__(0)}({0:function(module,exports,__webpack_require__){"use strict";function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),_FilterForm=__webpack_require__(13),_FilterForm2=_interopRequireDefault(_FilterForm),_columnFormatter=__webpack_require__(14),_columnFormatter2=_interopRequireDefault(_columnFormatter),DicomArchive=function(_React$Component){function DicomArchive(props){_classCallCheck(this,DicomArchive);var _this=_possibleConstructorReturn(this,(DicomArchive.__proto__||Object.getPrototypeOf(DicomArchive)).call(this,props));return _this.state={isLoaded:!1,filter:{}},_this.fetchData=_this.fetchData.bind(_this),_this.updateFilter=_this.updateFilter.bind(_this),_this.resetFilters=_this.resetFilters.bind(_this),_this}return _inherits(DicomArchive,_React$Component),_createClass(DicomArchive,[{key:"componentDidMount",value:function(){this.fetchData()}},{key:"fetchData",value:function(){$.ajax(this.props.DataURL,{method:"GET",dataType:"json",success:function(data){loris.hiddenHeaders=data.hiddenHeaders?data.hiddenHeaders:[],this.setState({Data:data,isLoaded:!0})}.bind(this),error:function(_error){console.error(_error)}})}},{key:"updateFilter",value:function(filter){this.setState({filter:filter})}},{key:"resetFilters",value:function(){this.refs.dicomFilter.clearFilter()}},{key:"render",value:function(){return this.state.isLoaded?React.createElement("div",null,React.createElement(_FilterForm2.default,{Module:"dicom_archive",name:"dicom_filter",id:"dicom_filter",ref:"dicomFilter",columns:2,formElements:this.state.Data.form,onUpdate:this.updateFilter,filter:this.state.filter},React.createElement(ButtonElement,{label:"Clear Filters",type:"reset",onUserInput:this.resetFilters})),React.createElement(StaticDataTable,{Data:this.state.Data.Data,Headers:this.state.Data.Headers,Filter:this.state.filter,getFormattedCell:_columnFormatter2.default})):React.createElement("button",{className:"btn-info has-spinner"},"Loading",React.createElement("span",{className:"glyphicon glyphicon-refresh glyphicon-refresh-animate"}))}}]),DicomArchive}(React.Component);DicomArchive.propTypes={Module:React.PropTypes.string.isRequired,DataURL:React.PropTypes.string.isRequired},window.onload=function(){var dataURL=loris.BaseURL+"/dicom_archive/?format=json",dicomArchive=React.createElement(DicomArchive,{Module:"dicom_archive",DataURL:dataURL}),dicomArchiveDOM=document.createElement("div");dicomArchiveDOM.id="page-dicom-archive";var rootDOM=document.getElementById("lorisworkspace");rootDOM.appendChild(dicomArchiveDOM),ReactDOM.render(dicomArchive,document.getElementById("page-dicom-archive"))}},2:function(module,exports){"use strict";function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}Object.defineProperty(exports,"__esModule",{value:!0});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),Panel=function(_React$Component){function Panel(props){_classCallCheck(this,Panel);var _this=_possibleConstructorReturn(this,(Panel.__proto__||Object.getPrototypeOf(Panel)).call(this,props));return _this.state={collapsed:_this.props.initCollapsed},_this.panelClass=_this.props.initCollapsed?"panel-collapse collapse":"panel-collapse collapse in",_this.toggleCollapsed=_this.toggleCollapsed.bind(_this),_this}return _inherits(Panel,_React$Component),_createClass(Panel,[{key:"toggleCollapsed",value:function(){this.setState({collapsed:!this.state.collapsed})}},{key:"render",value:function(){var glyphClass=this.state.collapsed?"glyphicon pull-right glyphicon-chevron-down":"glyphicon pull-right glyphicon-chevron-up",panelHeading=this.props.title?React.createElement("div",{className:"panel-heading",onClick:this.toggleCollapsed,"data-toggle":"collapse","data-target":"#"+this.props.id,style:{cursor:"pointer"}},this.props.title,React.createElement("span",{className:glyphClass})):"";return React.createElement("div",{className:"panel panel-primary"},panelHeading,React.createElement("div",{id:this.props.id,className:this.panelClass,role:"tabpanel"},React.createElement("div",{className:"panel-body",style:{height:this.props.height}},this.props.children)))}}]),Panel}(React.Component);Panel.propTypes={id:React.PropTypes.string,height:React.PropTypes.string,title:React.PropTypes.string},Panel.defaultProps={initCollapsed:!1,id:"default-panel",height:"100%"},exports.default=Panel},13:function(module,exports,__webpack_require__){"use strict";function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}Object.defineProperty(exports,"__esModule",{value:!0});var _typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(obj){return typeof obj}:function(obj){return obj&&"function"==typeof Symbol&&obj.constructor===Symbol&&obj!==Symbol.prototype?"symbol":typeof obj},_createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),_Panel=__webpack_require__(2),_Panel2=_interopRequireDefault(_Panel),FilterForm=function(_React$Component){function FilterForm(props){_classCallCheck(this,FilterForm);var _this=_possibleConstructorReturn(this,(FilterForm.__proto__||Object.getPrototypeOf(FilterForm)).call(this,props));return _this.clearFilter=_this.clearFilter.bind(_this),_this.getFormChildren=_this.getFormChildren.bind(_this),_this.setFilter=_this.setFilter.bind(_this),_this.onElementUpdate=_this.onElementUpdate.bind(_this),_this.queryString=QueryString.get(),_this}return _inherits(FilterForm,_React$Component),_createClass(FilterForm,[{key:"componentDidMount",value:function(){var filter={},queryString=this.queryString;Object.keys(queryString).forEach(function(key){var filterKey="candidateID"===key?"candID":key;filter[filterKey]={value:queryString[key],exactMatch:!1}}),this.props.onUpdate(filter)}},{key:"clearFilter",value:function(){this.queryString=QueryString.clear(this.props.Module),this.props.onUpdate({})}},{key:"getFormChildren",value:function(){var formChildren=[];return React.Children.forEach(this.props.children,function(child,key){if(React.isValidElement(child)&&"function"==typeof child.type&&child.props.onUserInput){var callbackFunc=child.props.onUserInput,callbackName=callbackFunc.name,elementName=child.type.displayName,queryFieldName="candID"===child.props.name?"candidateID":child.props.name,filterValue=this.queryString[queryFieldName];"onUserInput"===callbackName&&(callbackFunc="ButtonElement"===elementName&&"reset"===child.props.type?this.clearFilter:this.onElementUpdate.bind(null,elementName)),formChildren.push(React.cloneElement(child,{onUserInput:callbackFunc,value:filterValue?filterValue:"",key:key})),this.setFilter(elementName,child.props.name,filterValue)}else formChildren.push(React.cloneElement(child,{key:key}))}.bind(this)),formChildren}},{key:"setFilter",value:function(type,key,value){var filter={};return this.props.filter&&(filter=JSON.parse(JSON.stringify(this.props.filter))),key?(filter[key]={},0===value.length?filter[key].value="":key&&value&&(filter[key].value=value),filter[key].exactMatch="SelectElement"===type):filter&&key&&""===value&&delete filter[key],filter}},{key:"onElementUpdate",value:function(type,fieldName,fieldValue){if("string"==typeof fieldName&&("string"==typeof fieldValue||"object"===("undefined"==typeof fieldValue?"undefined":_typeof(fieldValue)))){var queryFieldName="candID"===fieldName?"candidateID":fieldName;this.queryString=QueryString.set(this.queryString,queryFieldName,fieldValue);var filter=this.setFilter(type,fieldName,fieldValue);this.props.onUpdate(filter)}}},{key:"render",value:function(){var formChildren=this.getFormChildren(),formElements=this.props.formElements;return formElements&&Object.keys(formElements).forEach(function(fieldName){var queryFieldName="candID"===fieldName?"candidateID":fieldName;formElements[fieldName].onUserInput=this.onElementUpdate.bind(null,fieldName),formElements[fieldName].value=this.queryString[queryFieldName]}.bind(this)),React.createElement(_Panel2.default,{id:this.props.id,height:this.props.height,title:this.props.title},React.createElement(FormElement,this.props,formChildren))}}]),FilterForm}(React.Component);FilterForm.defaultProps={id:"selection-filter",height:"100%",title:"Selection Filter",onUpdate:function(){console.warn("onUpdate() callback is not set!")}},FilterForm.propTypes={Module:React.PropTypes.string.isRequired,filter:React.PropTypes.object.isRequired,id:React.PropTypes.string,height:React.PropTypes.string,title:React.PropTypes.string,onUpdate:React.PropTypes.func},exports.default=FilterForm},14:function(module,exports){"use strict";function formatColumn(column,cell,rowData,rowHeaders){if(loris.hiddenHeaders.indexOf(column)>-1)return null;var row={};if(rowHeaders.forEach(function(header,index){row[header]=rowData[index]},this),"Archive Location"===column){var downloadURL="/mri/jiv/get_file.php?file="+cell,toRet=React.createElement("td",null,React.createElement("a",{href:downloadURL},React.createElement("span",{className:"glyphicon glyphicon-cloud-download"})," ",cell));return toRet}if("Metadata"===column){var metadataURL=loris.BaseURL+"/dicom_archive/viewDetails/?tarchiveID="+row.TarchiveID;return React.createElement("td",null,React.createElement("a",{href:metadataURL},cell))}if("MRI Browser"===column){if(null===row.SessionID||""===row.SessionID)return React.createElement("td",null," ");var mrlURL=loris.BaseURL+"/imaging_browser/viewSession/?sessionID="+row.SessionID;return React.createElement("td",null,React.createElement("a",{href:mrlURL},cell))}return"INVALID - HIDDEN"===cell?React.createElement("td",{className:"text-danger"},cell):React.createElement("td",null,cell)}Object.defineProperty(exports,"__esModule",{value:!0}),window.formatColumn=formatColumn,exports.default=formatColumn}});
 //# sourceMappingURL=dicom_archive.js.map
\ No newline at end of file
diff --git a/modules/dicom_archive/jsx/columnFormatter.js b/modules/dicom_archive/jsx/columnFormatter.js
index 64d8f393501..fe11e16e20a 100644
--- a/modules/dicom_archive/jsx/columnFormatter.js
+++ b/modules/dicom_archive/jsx/columnFormatter.js
@@ -20,6 +20,19 @@ function formatColumn(column, cell, rowData, rowHeaders) {
     row[header] = rowData[index];
   }, this);
 
+  if (column === 'Archive Location') {
+    var downloadURL = '/mri/jiv/get_file.php?file=' + cell;
+    var toRet =
+      <td>
+        <a href={downloadURL}>
+          <span className="glyphicon glyphicon-cloud-download"/>
+          &nbsp;
+          {cell}
+        </a>
+      </td>;
+    return toRet;
+  }
+
   if (column === 'Metadata') {
     var metadataURL = loris.BaseURL +
       "/dicom_archive/viewDetails/?tarchiveID=" + row.TarchiveID;
diff --git a/modules/dicom_archive/php/dicom_archive.class.inc b/modules/dicom_archive/php/dicom_archive.class.inc
index e8a33a26f6a..c9c5bec70db 100644
--- a/modules/dicom_archive/php/dicom_archive.class.inc
+++ b/modules/dicom_archive/php/dicom_archive.class.inc
@@ -45,7 +45,7 @@ class Dicom_Archive extends \NDB_Menu_Filter
      * Set up the variables required by NDB_Menu_Filter class for constructing
      * a query
      *
-     * @return null
+     * @return void
      */
     function _setupVariables()
     {
@@ -102,7 +102,7 @@ class Dicom_Archive extends \NDB_Menu_Filter
      * Converts the results of this menu filter to a JSON format to be retrieved
      * with ?format=json
      *
-     * @return a json encoded string of the headers and data from this table
+     * @return string a json encoded string of the headers and data from this table
      */
     function toJSON()
     {
@@ -161,7 +161,7 @@ class Dicom_Archive extends \NDB_Menu_Filter
      * Overrides base getJSDependencies() to add support for dicom specific
      * React column formatters.
      *
-     * @return an array of extra JS files that this page depends on
+     * @return array of extra JS files that this page depends on
      */
     function getJSDependencies()
     {
diff --git a/modules/dicom_archive/php/viewdetails.class.inc b/modules/dicom_archive/php/viewdetails.class.inc
index 751a02ea588..fa20301ee4a 100644
--- a/modules/dicom_archive/php/viewdetails.class.inc
+++ b/modules/dicom_archive/php/viewdetails.class.inc
@@ -44,7 +44,7 @@ class ViewDetails extends \NDB_Form
     /**
     * Sets up main parameters
     *
-    * @return NULL
+    * @return void
     */
     function setup()
     {
@@ -298,7 +298,7 @@ class ViewDetails extends \NDB_Form
     /**
      * Overrides base getJSDependencies() to add additional JS files
      *
-     * @return an array of extra JS files that this page depends on
+     * @return array of extra JS files that this page depends on
      */
     function getJSDependencies()
     {
diff --git a/modules/dicom_archive/test/dicom_archiveTest.php b/modules/dicom_archive/test/dicom_archiveTest.php
index 3a49d17e801..98bfbb43c4d 100644
--- a/modules/dicom_archive/test/dicom_archiveTest.php
+++ b/modules/dicom_archive/test/dicom_archiveTest.php
@@ -29,7 +29,7 @@ class DicomArchiveTestIntegrationTest extends LorisIntegrationTest
     //$location: css selector for react items
     static $patientID   = "#dicom_filter>div>div:nth-child(1)>div>div>input";
     static $PatientName = "#dicom_filter>div>div:nth-child(2)>div>div>input";
-    static $site        = "#Site";
+    static $site        = "select.form-control";
     static $Gender      = "#dicom_filter>div>div:nth-child(4)>div>div>input";
     static $dateOfBirth = "#dicom_filter>div>div:nth-child(5)>div>div>input";
     static $Acquisition = "#dicom_filter>div>div:nth-child(6)>div>div>input";
@@ -105,7 +105,7 @@ function testDicomArchivePermission()
      *
      * @return void
      */
-    function testdicomArchivFilterClearBtn()
+    function testdicomArchiveFilterClearBtn()
     {
         $this->safeGet($this->url . "/dicom_archive/");
         //testing data from RBdata.sql
diff --git a/modules/document_repository/README.md b/modules/document_repository/README.md
new file mode 100644
index 00000000000..8efaa0316c3
--- /dev/null
+++ b/modules/document_repository/README.md
@@ -0,0 +1,37 @@
+# Document Repository
+
+## Purpose
+
+ The Document Repository is a tool that provides a centralized location for non-candidate documents that are relevant to the study (i.e. unfilled versions of instruments, publications, or manual of operations).
+
+## Intended Users
+
+ LORIS users can view, download, upload, and delete files, as well as edit information pertaining to those files.
+ This module is used primarily by study coordinators/administrators who share study protocols and manuals, as well as data entry staff who consult these documents.
+
+## Scope
+
+ Any LORIS user can edit and delete all the files in the Document Repository module. 
+
+## Permissions
+
+ A user that has "document_repository_view" permission can view and upload files in Document Repository.
+ A user that has "document_repository_delete" permission can delete files in Document Repository.
+
+## Configurations
+
+- The Document Repository enables users to upload and organize project files of any type (PDF,Photo,Txt...) that can easily be viewable for users with appropriate permissions ("document_repository_view").
+
+- Check that the following settings are in the php.ini file. 
+```
+session.gc_maxlifetime = 10800  // After this number of seconds, stored data will be seen as 'garbage' and cleaned up by the garbage collection process.
+max_input_time = 10800          // Maximum amount of time each script may spend parsing request data (in seconds)
+max_execution_time = 10800      // Maximum execution time of each script (in seconds)
+upload_max_filesize = 1024M     // Maximum allowed size for uploaded files.
+post_max_size = 1024M           // Maximum size of POST data that PHP will accept.
+```
+
+- A mail server is required to send out email notification regarding the Document Repository updates.
+
+- Interactions: Notifications from the Document Repository module are visible on the Dashboard panel.
+  
diff --git a/modules/document_repository/ajax/documentEditUpload.php b/modules/document_repository/ajax/documentEditUpload.php
index d8865e3f2ae..0549b0d315e 100644
--- a/modules/document_repository/ajax/documentEditUpload.php
+++ b/modules/document_repository/ajax/documentEditUpload.php
@@ -58,7 +58,7 @@
         $instrument = $_POST['instrument'] !== '' ? $_POST['instrument'] : null;
         $pscid      = $_POST['pscid']      !== '' ? $_POST['pscid'] : null;
         $visit      = $_POST['visit']      !== '' ? $_POST['visit'] : null;
-        $comments   = $_POST['comments']   !== '' ? $_POST['commnets'] : null;
+        $comments   = $_POST['comments']   !== '' ? $_POST['comments'] : null;
         $version    = $_POST['version']    !== '' ? $_POST['version'] : null;
 
         $fileSize = $_FILES["file"]["size"];
diff --git a/modules/document_repository/css/document_repository.css b/modules/document_repository/css/document_repository.css
index e36abb5bd76..97f8d166d3d 100644
--- a/modules/document_repository/css/document_repository.css
+++ b/modules/document_repository/css/document_repository.css
@@ -277,16 +277,28 @@ label em {
     float: left;
     border: 1px solid #999;
 }
-.fileDDD::before{
-    position: absolute;
-    margin-top: 20px;
-    margin-left: -30px;
-    overflow: hidden;
-    width: 30px;
-    height: 1px;
-    content: '\a0';
-    background-color: #999;
+
+.document {
+  display: flex;
+  flex-direction: row;
+}
+
+.document a {
+  margin: auto 10px;
+}
+
+.line_element_container {
+  display: flex;
+  flex-directon: column;
+  width: 30px;
+}
+
+.line_element {
+  width: 100%;
+  height: 70%;
+  border-bottom: 1px solid #999;
 }
+
 #dir-tree>tr>td:first-child {
     padding: 0px;
     /*height: 100%;*/
@@ -295,8 +307,7 @@ label em {
     -webkit-box-sizing: border-box;
        -moz-box-sizing: border-box;
             box-sizing: border-box;
-    border-left:1px solid #999;
-    padding-left: 30px;
+    border-left: 1px solid #999;
     height:100%;
     overflow: auto;
     word-break: break-word;
@@ -335,4 +346,4 @@ label em {
     .directoryRow>td{
     height: 100%;
 }
-}
\ No newline at end of file
+}
diff --git a/modules/document_repository/js/document_repository_helper.js b/modules/document_repository/js/document_repository_helper.js
index a199581a64c..26d9783a5bb 100644
--- a/modules/document_repository/js/document_repository_helper.js
+++ b/modules/document_repository/js/document_repository_helper.js
@@ -239,6 +239,10 @@ function renderTree() {
         //new table layout
         var file = $('#file').html();
         Mustache.parse(file);   // optional, speeds up future uses
+
+        //pass delete permissions info
+        files[ii].hasDeletePerm = loris.userHasPermission('document_repository_delete');
+
         if (!filtered) {
           files[ii].indent = (depth) * 60;
           files[ii].parentID = dirID;
diff --git a/modules/document_repository/php/document_repository.class.inc b/modules/document_repository/php/document_repository.class.inc
index 91c43e0ae79..37d0ae373d8 100644
--- a/modules/document_repository/php/document_repository.class.inc
+++ b/modules/document_repository/php/document_repository.class.inc
@@ -46,7 +46,7 @@ class Document_Repository extends \NDB_Menu_Filter
     /**
      * Function _setupVariables
      *
-     * @return none
+     * @return void
      */
     function _setupVariables()
     {
@@ -125,7 +125,7 @@ class Document_Repository extends \NDB_Menu_Filter
     /**
      * Set filter form function
      *
-     * @return bool
+     * @return void
      */
     function _setFilterForm()
     {
@@ -290,11 +290,11 @@ class Document_Repository extends \NDB_Menu_Filter
      * filter table, it doesn't
      * use pagination
      *
-     * @return void
+     * @return array
      */
     function _getList()
     {
-        return;
+        return array();
     }
 
     /**
@@ -306,6 +306,7 @@ class Document_Repository extends \NDB_Menu_Filter
     function _setDataTable()
     {
         $DB       = \Database::singleton();
+        $user     = \User::singleton();
         $results  = array();
         $query    = "SELECT * FROM document_repository_categories".
                     " ORDER BY parent_id ASC";
@@ -364,6 +365,9 @@ class Document_Repository extends \NDB_Menu_Filter
         $DB = \Database::singleton();
 
         // print out column headings
+        if (!$user->hasPermission('document_repository_delete')) {
+            unset($this->headers[array_search('Delete', $this->headers)]);
+        }
         $i = 0;
         foreach ($this->headers as $header) {
             $this->tpl_data['headers'][$i]['name'] = $header;
@@ -387,9 +391,9 @@ class Document_Repository extends \NDB_Menu_Filter
     /**
      * SetDataTableRows function
      *
-     * @param string $count the value of count
+     * @param int $count the number of data rows
      *
-     * @return bool
+     * @return void
      */
     function _setDataTableRows($count)
     {
diff --git a/modules/document_repository/templates/menu_document_repository.tpl b/modules/document_repository/templates/menu_document_repository.tpl
index 4d187ea3ed0..35db90a7847 100644
--- a/modules/document_repository/templates/menu_document_repository.tpl
+++ b/modules/document_repository/templates/menu_document_repository.tpl
@@ -19,10 +19,13 @@
     <tr id="{{ id }}a" {{ #parentID }}class="{{ parentID }}a directoryRow" style="display:none"{{ /parentID }}>
         <td class="fileColumn" colspan="10">
             {{ #indent }}
-                <div class="fileDDD" style="{{ margin }}">
-                    <span style="padding: 8px" class='directory glyphicon glyphicon-chevron-right' data-container="body" data-toggle="popover" data-placement="right" data-content="{{ Comment }}">
-                        {{ name }}
-                    </span>
+                <div class = "document" style="{{ margin }}">
+                    <div class="line_element_container"><div class="line_element"></div><div></div></div>
+                    <div class="fileDDD">
+                        <span style="padding: 8px;" class='directory glyphicon glyphicon-chevron-right' data-container="body" data-toggle="popover" data-placement="right" data-content="{{ Comment }}">
+                            {{ name }}
+                        </span>
+                    </div>
                 </div>
             {{ /indent }}
             {{ ^indent }}
@@ -36,11 +39,13 @@
 <script id="file" type="x-tmpl-mustache">
     <tr class="{{ parentID }}a fileRow" {{ ^filtered }}style="display:none" {{ /filtered }}>
         <td class="blah fileColumn">
-            <div {{ ^filtered }}class="fileDDD" style="{{ margin }}"{{ /filtered }}><div style="padding-top: 8px">
-                <a href="{/literal}{$baseurl}{literal}/document_repository/ajax/GetFile.php?File={{ Data_dir }}" target="_blank" download="{{ File_name }}">
-                        {{ File_name }}
-                </a>({{ File_size }})
-            </div></div>
+            <div {{ ^filtered }}class="fileDDD" style="{{ margin }}"{{ /filtered }}>
+                <div class="document" style="padding-top: 8px">
+                    <div class="line_element_container"><div class="line_element"></div><div></div></div>
+		    <a href="{/literal}{$baseurl}{literal}/document_repository/ajax/GetFile.php?File={{ Data_dir }}" target="_blank" download="{{ File_name }}">{{ File_name }}</a>
+		    ({{ File_size }})
+                </div>
+            </div>
         </td>
         <td>
             {{ version }}
@@ -66,9 +71,11 @@
         <td nowrap="nowrap">
             <a href="#" id="{{ record_id }}" class="theeditlink">Edit</a>
         </td>
+        {{ #hasDeletePerm}}
         <td nowrap="nowrap">
             <a href="#" id="{{ record_id }}" class="thedeletelink">Delete</a>
         </td>
+        {{ /hasDeletePerm }}
     </tr>
 </script>
 {/literal}
diff --git a/modules/examiner/README.md b/modules/examiner/README.md
new file mode 100644
index 00000000000..2d51836aec2
--- /dev/null
+++ b/modules/examiner/README.md
@@ -0,0 +1,92 @@
+# Examiner
+
+## Purpose
+
+The Examiner module displays the list of examiners in the study and allows 
+for additions and removal of certifications for each examiner listed.
+
+## Intended Users
+
+The primary type of users is:
+1. Site coordinators adding examiners and adding certifications to examiners
+
+
+## Scope
+
+This module displays information about examiners as well as certifications and 
+sites to which the examiners are affiliated. It also allows adding examiners 
+to sites, to give or remove certifications for instruments and set them as 
+radiologists.
+
+NOT in scope:
+
+Management of the certification instruments and of the sites is external to 
+this module.
+
+The Examiner architecture is completely separate from the User 
+architecture intentionally; examiners may or may not be users.
+
+
+## Permissions
+
+The Examiner module uses the following permissions. Any one of them 
+is sufficient to have access to the module.
+
+examiner_view
+ - This permission gives the user viewing and editing access to all 
+ examiners and certifications within their own site
+
+examiner_multisite
+ - This permission gives the user viewing and editing access to all 
+ examiners and certifications at all sites.
+
+## Configurations
+
+The examiner module has the following configurations that affect its usage
+
+EnableCertification
+ - Binary entry for sub-tag `<EnableCertification>` under the tag 
+ `<Certification>` in the config.xml file. Options `1` or `0` enable or 
+ disable, respectively, the use of certification for projects defined 
+ in the `<CertificationProjects>` section or all projects if none are 
+ explicitly stated.
+   
+
+CertificationProjects (Config.xml)
+ - Projects for which certification is enabled, should match entries in 
+ `Project` table in the database. The project identifier should be placed 
+ within the `<CertificationProject>` tags as such 
+ `<CertificationProject>1</CertificationProject>`.
+
+CertificationInstruments
+ - Instruments which require certification to be able to administer. 
+ When an instrument is added to this list, the examiner dropdown found 
+ at the top page this instrument is populated only with examiners having 
+ obtained a certification for it.
+
+startYear
+ - Min date of certification. This is entry is also the start year of the study.
+
+endYear
+ - Max date of certification. This is entry is also the end year of the study.
+
+## Interactions with LORIS
+
+- The list of examiners displayed at the top page of instruments is 
+dependent on entries in this module. The list is populated 
+with examiners that exist in the database, are at the same site 
+and have the appropriate certifications (if configured); failure to 
+match these 3 criteria will result in the examiner not being displayed.
+
+- The user_accounts module allows for quick activation/deactivation of 
+an examiner as well as setting their sites and their radiologist status.
+When an examiner is added from the user_accounts module, the `userID` field of 
+the `examiners` table in the database is populated to associate the examiner 
+to the user.
+
+- The Training module allows the study to automatically assign 
+certification upon successful completion of training. The module 
+starts by verifying that the user is indeed an examiner 
+before beginning the training. The certifications should appear 
+in the examiner module once obtained by an examiner and it should 
+be dated with the date of completion of the training process.
diff --git a/modules/examiner/php/editexaminer.class.inc b/modules/examiner/php/editexaminer.class.inc
index 20a74d65a91..8906b0e64f1 100644
--- a/modules/examiner/php/editexaminer.class.inc
+++ b/modules/examiner/php/editexaminer.class.inc
@@ -142,16 +142,20 @@ class EditExaminer extends \NDB_Form
              // if certification for new instrument for the examiner
             if (empty($certID) && !empty($certStatus)) {
                 // insert a new certification entry
+                $data = array(
+                         'examinerID' => $examinerID,
+                         'testID'     => $testID,
+                         'pass'       => $certStatus,
+                         'comment'    => $comment,
+                        );
+                if ($date_cert != "") {
+                    $data['date_cert'] = $date_cert;
+                }
                 $DB->insert(
                     'certification',
-                    array(
-                     'examinerID' => $examinerID,
-                     'date_cert'  => $date_cert,
-                     'testID'     => $testID,
-                     'pass'       => $certStatus,
-                     'comment'    => $comment,
-                    )
+                    $data
                 );
+
                 $certID = $DB->pselectOne(
                     "SELECT certID 
                      FROM certification
@@ -162,19 +166,23 @@ class EditExaminer extends \NDB_Form
                     )
                 );
                 // Add a new entry to the certification history table
+                $data = array(
+                         'col'         => 'pass',
+                         'new'         => $certStatus,
+                         'primaryVals' => $certID,
+                         'testID'      => $testID,
+                         'visit_label' => $visit_label,
+                         'changeDate'  => date("Y-m-d H:i:s"),
+                         'userID'      => $_SESSION['State']->getUsername(),
+                         'type'        => 'I',
+                        );
+                if ($date_cert != "") {
+                    $data['new_date'] = $date_cert;
+                }
+
                 $DB->insert(
                     'certification_history',
-                    array(
-                     'col'         => 'pass',
-                     'new'         => $certStatus,
-                     'new_date'    => $date_cert,
-                     'primaryVals' => $certID,
-                     'testID'      => $testID,
-                     'visit_label' => $visit_label,
-                     'changeDate'  => date("Y-m-d H:i:s"),
-                     'userID'      => $_SESSION['State']->getUsername(),
-                     'type'        => 'I',
-                    )
+                    $data
                 );
             } else { // update to a test certification for the examiner
 
@@ -210,13 +218,16 @@ class EditExaminer extends \NDB_Form
                     || $oldCertification['date_cert'] != $date_cert
                 ) {
                     // Update the certification entry
+                    $data = array(
+                             'pass'    => $certStatus,
+                             'comment' => $comment,
+                            );
+                    if ($date_cert != "") {
+                        $data['date_cert'] = $date_cert;
+                    }
                     $DB->update(
                         'certification',
-                        array(
-                         'date_cert' => $date_cert,
-                         'pass'      => $certStatus,
-                         'comment'   => $comment,
-                        ),
+                        $data,
                         array(
                          'examinerID' => $examinerID,
                          'testID'     => $testID,
@@ -225,21 +236,26 @@ class EditExaminer extends \NDB_Form
 
                     // Add a new entry to the certification history table
                     if ($oldDate != $date_cert || $oldVal != $certStatus) {
+                        $data = array(
+                                 'col'         => 'pass',
+                                 'old'         => $oldVal,
+                                 'new'         => $certStatus,
+                                 'primaryVals' => $certID,
+                                 'testID'      => $testID,
+                                 'visit_label' => $visit_label,
+                                 'changeDate'  => date("Y-m-d H:i:s"),
+                                 'userID'      => $_SESSION['State']->getUsername(),
+                                 'type'        => 'U',
+                                );
+                        if ($oldDate != "") {
+                            $data['old_date'] = $oldDate;
+                        }
+                        if ($date_cert != "") {
+                            $data['new_date'] = $date_cert;
+                        }
                         $DB->insert(
                             'certification_history',
-                            array(
-                             'col'         => 'pass',
-                             'old'         => $oldVal,
-                             'old_date'    => $oldDate,
-                             'new'         => $certStatus,
-                             'new_date'    => $date_cert,
-                             'primaryVals' => $certID,
-                             'testID'      => $testID,
-                             'visit_label' => $visit_label,
-                             'changeDate'  => date("Y-m-d H:i:s"),
-                             'userID'      => $_SESSION['State']->getUsername(),
-                             'type'        => 'U',
-                            )
+                            $data
                         );
                     }
                 }
@@ -353,6 +369,7 @@ class EditExaminer extends \NDB_Form
      */
     function _validateEditExaminer($values)
     {
+        $DB     = \Database::singleton();
         $errors = array();
 
         // check that there is both a status and a date (neither can be null)
@@ -360,8 +377,8 @@ class EditExaminer extends \NDB_Form
             if (empty($certificationStatus)
                 || empty($values['date_cert'][$instrumentID])
             ) {
-                if (!(empty($certificationStatus)
-                    && empty($values['date_cert'][$instrumentID]))
+                if (($certificationStatus == "certified")
+                    && empty($values['date_cert'][$instrumentID])
                 ) {
                     $errors['certStatus[' . $instrumentID .']'] = 'Both certification
                         status and date must be filled out';
@@ -369,6 +386,20 @@ class EditExaminer extends \NDB_Form
             }
         }
 
+        // check if previously recorded certification are all present
+        // (can not delete, only change status)
+        $rows = $DB->pselect(
+            "SELECT c.testID
+              FROM certification c
+              WHERE c.examinerID=:EID",
+            array('EID' => $this->identifier)
+        );
+        foreach ($rows as $row) {
+            if ($values['certStatus'][$row['testID']] == "") {
+                $errors['certStatus['.$row['testID'].']']
+                    = 'You can not delete a status';
+            }
+        }
         return $errors;
     }
 
diff --git a/modules/examiner/php/examiner.class.inc b/modules/examiner/php/examiner.class.inc
index 8150493532a..303f94f873a 100644
--- a/modules/examiner/php/examiner.class.inc
+++ b/modules/examiner/php/examiner.class.inc
@@ -42,7 +42,7 @@ class Examiner extends \NDB_Menu_Filter_Form
     /**
      * Sets the menu filter class variables.
      *
-     * @return boolean
+     * @return void
      */
     function _setupVariables()
     {
@@ -130,7 +130,7 @@ class Examiner extends \NDB_Menu_Filter_Form
      * that are common to every type of page. May be overridden by a specific
      * page or specific page type.
      *
-     * @return null
+     * @return void
      */
     function setup()
     {
@@ -206,7 +206,7 @@ class Examiner extends \NDB_Menu_Filter_Form
      *
      * @param array $values add examiner form values
      *
-     * @return void
+     * @return bool
      */
     function _process($values)
     {
@@ -267,6 +267,7 @@ class Examiner extends \NDB_Menu_Filter_Form
         );
 
         header("Location: {$baseurl}/examiner/", true, 303);
+        return true;
     }
 
     /**
diff --git a/modules/genomic_browser/php/cnv_browser.class.inc b/modules/genomic_browser/php/cnv_browser.class.inc
index 39da469d98b..41d06248476 100644
--- a/modules/genomic_browser/php/cnv_browser.class.inc
+++ b/modules/genomic_browser/php/cnv_browser.class.inc
@@ -58,8 +58,7 @@ class CNV_Browser extends \NDB_Menu_Filter
     /**
      * Function _setupVariables
      *
-     * @note   overloaded function
-     * @return bool
+     * @return void
     */
     function _setupVariables()
     {
@@ -209,7 +208,7 @@ class CNV_Browser extends \NDB_Menu_Filter
      * that are common to every type of page. May be overridden by a specific
      * page or specific page type.
      *
-     * @return none
+     * @return void
      */
     function setup()
     {
diff --git a/modules/genomic_browser/php/cpg_browser.class.inc b/modules/genomic_browser/php/cpg_browser.class.inc
index 2817dddd6ed..f7b4559ec12 100644
--- a/modules/genomic_browser/php/cpg_browser.class.inc
+++ b/modules/genomic_browser/php/cpg_browser.class.inc
@@ -60,8 +60,7 @@ class CpG_Browser extends \NDB_Menu_Filter
     /**
      * Function _setupVariables
      *
-     * @note   overloaded function
-     * @return bool
+     * @return void
     */
     function _setupVariables()
     {
@@ -253,7 +252,7 @@ class CpG_Browser extends \NDB_Menu_Filter
      * that are common to every type of page. May be overridden by a specific
      * page or specific page type.
      *
-     * @return none
+     * @return void
      */
     function setup()
     {
diff --git a/modules/genomic_browser/php/genomic_browser.class.inc b/modules/genomic_browser/php/genomic_browser.class.inc
index 62930c7b70b..f148ebc933f 100644
--- a/modules/genomic_browser/php/genomic_browser.class.inc
+++ b/modules/genomic_browser/php/genomic_browser.class.inc
@@ -60,7 +60,7 @@ class Genomic_Browser extends \NDB_Menu_Filter
      * Function _setupVariables
      *
      * @note   overloaded function
-     * @return bool
+     * @return void
     */
     function _setupVariables()
     {
@@ -190,7 +190,7 @@ class Genomic_Browser extends \NDB_Menu_Filter
      * that are common to every type of page. May be overridden by a specific
      * page or specific page type.
      *
-     * @return none
+     * @return void
      */
     function setup()
     {
diff --git a/modules/genomic_browser/php/genomic_file_uploader.class.inc b/modules/genomic_browser/php/genomic_file_uploader.class.inc
index 28421152f42..14002635eeb 100644
--- a/modules/genomic_browser/php/genomic_file_uploader.class.inc
+++ b/modules/genomic_browser/php/genomic_file_uploader.class.inc
@@ -48,8 +48,7 @@ class Genomic_File_Uploader extends \NDB_Menu_Filter
     /**
      * Function _setupVariables
      *
-     * @note   overloaded function
-     * @return bool
+     * @return void
     */
     function _setupVariables()
     {
@@ -111,7 +110,7 @@ class Genomic_File_Uploader extends \NDB_Menu_Filter
      * that are common to every type of page. May be overridden by a specific
      * page or specific page type.
      *
-     * @return none
+     * @return void
      */
     function setup()
     {
diff --git a/modules/genomic_browser/php/gwas_browser.class.inc b/modules/genomic_browser/php/gwas_browser.class.inc
index 1eab4ac0798..e32d896e5fe 100644
--- a/modules/genomic_browser/php/gwas_browser.class.inc
+++ b/modules/genomic_browser/php/gwas_browser.class.inc
@@ -52,8 +52,7 @@ class GWAS_Browser extends \NDB_Menu_Filter
     /**
      * Function _setupVariables
      *
-     * @note   overloaded function
-     * @return bool
+     * @return void
     */
     function _setupVariables()
     {
@@ -118,7 +117,7 @@ class GWAS_Browser extends \NDB_Menu_Filter
      * that are common to every type of page. May be overridden by a specific
      * page or specific page type.
      *
-     * @return none
+     * @return void
      */
     function setup()
     {
diff --git a/modules/genomic_browser/php/snp_browser.class.inc b/modules/genomic_browser/php/snp_browser.class.inc
index 783cccf8a9b..508887ca82e 100644
--- a/modules/genomic_browser/php/snp_browser.class.inc
+++ b/modules/genomic_browser/php/snp_browser.class.inc
@@ -59,8 +59,7 @@ class SNP_Browser extends \NDB_Menu_Filter
     /**
      * Function _setupVariables
      *
-     * @note   overloaded function
-     * @return bool
+     * @return void
     */
     function _setupVariables()
     {
@@ -233,7 +232,7 @@ class SNP_Browser extends \NDB_Menu_Filter
      * that are common to every type of page. May be overridden by a specific
      * page or specific page type.
      *
-     * @return none
+     * @return void
      */
     function setup()
     {
diff --git a/modules/help_editor/README.md b/modules/help_editor/README.md
new file mode 100644
index 00000000000..862a35be31d
--- /dev/null
+++ b/modules/help_editor/README.md
@@ -0,0 +1,33 @@
+# Help Editor
+
+## Purpose
+
+The help editor module provides a menu to view and edit online help
+for LORIS.
+
+## Intended Users
+
+The help editor is intended to be used by data coordinating staff
+to write the help content for instruments that are part of their
+LORIS instance, but not part of the core LORIS install.
+
+## Scope
+
+Only instrument help text is intended to be edited. Module help
+text for modules that are part of LORIS should come from the markdown
+files which are in the module's `help/` directory.
+
+## Permissions
+
+The `context_help` permission is required to access the help editor
+module.
+
+## Configurations
+
+None.
+
+## Interactions with LORIS
+
+The ajax script used by all LORIS page's inline help to load content
+is part of the Help Editor module. This should likely be revisited in
+the future.
diff --git a/modules/help_editor/js/help_editor_helper.js b/modules/help_editor/js/help_editor_helper.js
index 1e80f09b8aa..d24be44e276 100644
--- a/modules/help_editor/js/help_editor_helper.js
+++ b/modules/help_editor/js/help_editor_helper.js
@@ -9,21 +9,23 @@ $("input[name=preview]").click(function(e) {
         content = $('textarea[name="content"]').val(),
         myDate  = new Date(),
         div     = document.createElement("div"),
-        pre     = document.createElement("pre"),
         btn     = document.createElement("BUTTON"),
-        text    = document.createTextNode("Edit"),
-        button  = document.createTextNode("Close");
+        button  = document.createTextNode("Close"),
+        wrap    = document.createElement("div");
 
-     pre.innerHTML  = "<h3>" + title + "</h3>";
-     pre.innerHTML += content;
-     pre.innerHTML  =  pre.innerHTML + "<hr>Last updated: " + myDate.getFullYear() + "-" +
+     wrap.setAttribute("id", "help-wrapper");
+     wrap.innerHTML  = "<h3>" + title + "</h3>";
+     markdownContent = document.createElement("div");
+     ReactDOM.render(RMarkdown({content: content}), markdownContent);
+     wrap.appendChild(markdownContent);
+     wrap.innerHTML  =  wrap.innerHTML + "<hr>Last updated: " + myDate.getFullYear() + "-" +
                       (myDate.getMonth() +1) + "-" + myDate.getDate() + " " +
                       myDate.getHours() + ":" + myDate.getMinutes() + ":" + myDate.getSeconds();
      btn.appendChild(button);
      btn.className="btn btn-default";
      btn.setAttribute("id","helpclose");
-     div.appendChild(pre);
      div.appendChild(btn);
+     div.appendChild(wrap);
      document.getElementById('page').appendChild(div);
      div.setAttribute("class", "help-content");
      btn.addEventListener("click", function(e) {
diff --git a/modules/help_editor/php/edit_help_content.class.inc b/modules/help_editor/php/edit_help_content.class.inc
index 1ceeb56f4c7..ac871e7aeef 100644
--- a/modules/help_editor/php/edit_help_content.class.inc
+++ b/modules/help_editor/php/edit_help_content.class.inc
@@ -42,7 +42,7 @@ class Edit_Help_Content extends \NDB_Form
      /**
       * Returns default help content of the page
       *
-      * @return default array
+      * @return array
       */
     function _getDefaults()
     {
@@ -50,14 +50,13 @@ class Edit_Help_Content extends \NDB_Form
         //Get the default values
 
         // Sanitize user input
-        $safeHelpID     = htmlspecialchars($_REQUEST['helpID']);
         $safeSection    = $_REQUEST['section'] ?
             htmlspecialchars($_REQUEST['section']) : '';
         $safeSubsection = $_REQUEST['subsection'] ?
             htmlspecialchars($_REQUEST['subsection']) : '';
 
         if (isset($_REQUEST['helpID'])) {
-            $helpID = $safeHelpID;
+            $helpID = htmlspecialchars($_REQUEST['helpID']);
         }
         if (!empty($_REQUEST['section'])) {
             $helpID = HelpFile::hashToID(md5($_REQUEST['section']));
@@ -82,6 +81,8 @@ class Edit_Help_Content extends \NDB_Form
             }
 
         }
+        // let escaped html display as intended in form
+        $defaults['content'] = htmlspecialchars_decode($defaults['content']);
         // case where no help content exists
         if (empty($defaults['title'])) {
             if (!empty($_REQUEST['section'])) {
@@ -105,7 +106,7 @@ class Edit_Help_Content extends \NDB_Form
      /**
       * Process function
       *
-      * @param string $values the value
+      * @param array $values the values being processed
       *
       * @return void
       */
@@ -115,15 +116,13 @@ class Edit_Help_Content extends \NDB_Form
         //Get the default values
 
         // Sanitize user input
-        $safeHelpID     = htmlspecialchars($_REQUEST['helpID']);
-        $safeParentID   = htmlspecialchars($_REQUEST['parentID']);
         $safeSection    = htmlspecialchars($_REQUEST['section']);
         $safeSubsection = htmlspecialchars($_REQUEST['subsection']);
         if (isset($_REQUEST['helpID'])) {
-            $helpID = $safeHelpID;
+            $helpID = htmlspecialchars($_REQUEST['helpID']);
         }
         if (isset($_REQUEST['parentID'])) {
-            $parentID = $safeParentID;
+            $parentID = htmlspecialchars($_REQUEST['parentID']);
         }
 
         if (!empty($_REQUEST['section'])) {
diff --git a/modules/help_editor/php/help_editor.class.inc b/modules/help_editor/php/help_editor.class.inc
index cb928c4d119..406f90ce184 100644
--- a/modules/help_editor/php/help_editor.class.inc
+++ b/modules/help_editor/php/help_editor.class.inc
@@ -40,7 +40,7 @@ class Help_Editor extends \NDB_Menu_Filter
      /**
        * Setup Variables function
        *
-       * @return bool
+       * @return void
        */
     function _setupVariables()
     {
@@ -89,7 +89,7 @@ class Help_Editor extends \NDB_Menu_Filter
      * that are common to every type of page. May be overridden by a specific
      * page or specific page type.
      *
-     * @return none
+     * @return void
      */
     function setup()
     {
@@ -98,15 +98,14 @@ class Help_Editor extends \NDB_Menu_Filter
         // add form elements
         $this->addBasicText('topic', 'Help topic:');
         $this->addBasicText('keyword', 'Search keyword');
-
-        return true;
     }
+
      /**
        * SetDataTableRows
        *
-       * @param string $count the value of count
+       * @param int $count the value of count
        *
-       * @return bool
+       * @return void
        */
     function _setDataTableRows($count)
     {
diff --git a/modules/help_editor/php/helpfile.class.inc b/modules/help_editor/php/helpfile.class.inc
index b14cf764482..641cd08ad8e 100644
--- a/modules/help_editor/php/helpfile.class.inc
+++ b/modules/help_editor/php/helpfile.class.inc
@@ -87,7 +87,7 @@ class HelpFile
         $DB =& \Database::singleton();
 
         // insert a help file
-        $success = $DB->insert('help', $set);
+        $success = $DB->unsafeinsert('help', $set);
         // return the help ID
         return $DB->lastInsertID;
     }
@@ -106,7 +106,7 @@ class HelpFile
         $DB =& \Database::singleton();
 
         // update the help file
-        $success = $DB->update('help', $set, array('helpID' => $this->helpID));
+        $success = $DB->unsafeupdate('help', $set, array('helpID' => $this->helpID));
 
         return true;
     }
diff --git a/modules/imaging_browser/README.md b/modules/imaging_browser/README.md
new file mode 100644
index 00000000000..82e585a5a9d
--- /dev/null
+++ b/modules/imaging_browser/README.md
@@ -0,0 +1,84 @@
+# Imaging Browser
+
+## Purpose
+
+The imaging browser is intended to allow users to view candidate
+scan sessions collected for a study.
+
+## Intended Users
+
+The three primary types of users are:
+1. Imaging specialists using the modules to do online QC
+2. Project radiologists viewing images to report incidental findings
+3. Site coordinators or researchers ensuring their uploaded scans have
+   been processed and inserted into LORIS.
+
+## Scope
+
+The imaging browser displays processed images which meet the study's
+inclusion criteria. The inclusion criteria (for most images) is defined
+and enforced in the LORIS imaging pipeline scripts.  Derived or
+processed scan types are also included and have their own insertion
+criteria.
+
+NOT in scope:
+
+The imaging browser module does not display raw DICOMs or perform automated
+quality control on images. It only displays images that have already been
+inserted into LORIS.
+
+## <a name="imaging_browser_perm_link"></a> Permissions
+
+The imaging browser module uses the following permissions. Any one of them
+(except imaging_browser_qc) is sufficient to have access to the module.
+
+imaging_browser_view_allsites
+    - This permission gives the user access to all scans in the database
+
+imaging_browser_view_site
+    - This permission gives the user access to scans from their own site(s) only
+
+imaging_browser_phantom_allsites
+    - This permission gives the user access to phantom, but not candidate, scans
+      across the database
+
+imaging_browser_phantom_ownsite
+    - This permission gives the user access to phantom, but not candidate, data
+      at the user's site(s).
+
+imaging_browser_qc
+    - This permission gives the user access to modify the quality control data
+      for the associated scans and timepoints.
+
+## Configurations
+
+The imaging browser has the following configurations that affect its usage
+
+tblScanTypes - This setting determines which scan types are considered "NEW" for
+        QC purposes. It also determines which modalities are displayed on the
+        main imaging browser menu page.
+
+ImagingBrowserLinkedInstruments - This setting defines which instruments to 
+        include a link to on the viewsession page.
+
+useProjects - This setting determines whether "project" filtering dropdowns exist
+        on the menu page.
+
+useEDC - This setting determines whether "EDC" filtering dropdowns exist
+        on the menu page.
+
+mantis_url - This setting defines a URL for LORIS to include a link to for bug reporting
+        on the viewsession page.
+
+## Interactions with LORIS
+
+- The "Selected" set by the imaging QC specialist is used by the dataquery
+  module in order to determine which scan to insert when multiple scans of
+  a modality type exist for a given session. (The importer exists in
+  `$LORIS/tools/CouchDB_Import_MRI.php` alongside all other CouchDB
+  import scripts, but should logically be considered part of this module.)
+- The imaging browser module includes links to BrainBrowser to visualize data.
+- The control panel on the viewsession page includes links to the instruments
+  as configured by the study.
+- The control panel on the viewsession page includes links to the DICOM Archive
+  for any DICOM tars associated with the given session.
diff --git a/modules/imaging_browser/css/imaging_browser.css b/modules/imaging_browser/css/imaging_browser.css
index 57b83f5132c..9ab31655df5 100644
--- a/modules/imaging_browser/css/imaging_browser.css
+++ b/modules/imaging_browser/css/imaging_browser.css
@@ -49,6 +49,7 @@ dl {
 
 .div-controlpanel-bottom {
     margin-left: 12px;
+    padding-bottom: 50px;
 }
 
 .dt-qc-status {
@@ -118,3 +119,7 @@ h3 {
   color: #064785;
   text-decoration: none;
 }
+
+.tooltip-inner {
+  max-width: none;
+}
diff --git a/modules/imaging_browser/js/ImagePanel.js b/modules/imaging_browser/js/ImagePanel.js
index 76113c70bf3..c5fb545a1f7 100644
--- a/modules/imaging_browser/js/ImagePanel.js
+++ b/modules/imaging_browser/js/ImagePanel.js
@@ -1,2 +1,2 @@
-!function(modules){function __webpack_require__(moduleId){if(installedModules[moduleId])return installedModules[moduleId].exports;var module=installedModules[moduleId]={exports:{},id:moduleId,loaded:!1};return modules[moduleId].call(module.exports,module,module.exports,__webpack_require__),module.loaded=!0,module.exports}var installedModules={};return __webpack_require__.m=modules,__webpack_require__.c=installedModules,__webpack_require__.p="",__webpack_require__(0)}([function(module,exports){"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var ImagePanelHeader=React.createClass({displayName:"ImagePanelHeader",mixins:[React.addons.PureRenderMixin],render:function(){var QCStatusLabel;"Pass"===this.props.QCStatus?QCStatusLabel=React.createElement("span",{className:"label label-success"},this.props.QCStatus):"Fail"===this.props.QCStatus&&(QCStatusLabel=React.createElement("span",{className:"label label-danger"},this.props.QCStatus));var arrow;arrow=this.props.Expanded?React.createElement("span",{onClick:this.props.onToggleBody,className:"pull-right clickable glyphicon arrow glyphicon-chevron-up"}):React.createElement("span",{onClick:this.props.onToggleBody,className:"pull-right clickable glyphicon arrow glyphicon-chevron-down"});var headerButton=React.createElement("div",{className:"pull-right"},React.createElement("div",{className:"btn-group views"},React.createElement("button",{type:"button",className:"btn btn-default btn-xs dropdown-toggle",onClick:this.props.onToggleHeaders,"aria-expanded":this.props.HeadersExpanded},"Header Info"),React.createElement("span",{className:"caret"})));return React.createElement("div",{className:"panel-heading clearfix"},React.createElement("input",{type:"checkbox","data-file-id":this.props.FileID,className:"mripanel user-success"}),React.createElement("h3",{className:"panel-title"},this.props.Filename," "),QCStatusLabel,arrow,headerButton)}}),ImagePanelHeadersTable=React.createClass({displayName:"ImagePanelHeadersTable",componentDidMount:function(){$(ReactDOM.findDOMNode(this)).DynamicTable()},componentWillUnmount:function(){$(ReactDOM.findDOMNode(this)).DynamicTable({removeDynamicTable:!0})},render:function(){return React.createElement("table",{className:"table table-hover table-bordered header-info col-xs-12 dynamictable"},React.createElement("tbody",null,React.createElement("tr",null,React.createElement("th",{className:"info col-xs-2"},"Voxel Size"),React.createElement("td",{className:"col-xs-6",colSpan:"3"},""===this.props.HeaderInfo.XStep?" ":"X: "+this.props.HeaderInfo.XStep+" mm ",""===this.props.HeaderInfo.YStep?" ":"Y: "+this.props.HeaderInfo.YStep+" mm ",""===this.props.HeaderInfo.ZStep?" ":"Z: "+this.props.HeaderInfo.ZStep+" mm "),React.createElement("th",{className:"col-xs-2 info"},"Output Type"),React.createElement("td",{className:"col-xs-2"},this.props.HeaderInfo.OutputType)),React.createElement("tr",null,React.createElement("th",{className:"col-xs-2 info"},"Acquisition Date"),React.createElement("td",{className:"col-xs-2"},this.props.HeaderInfo.AcquisitionDate),React.createElement("th",{className:"col-xs-2 info"},"Space"),React.createElement("td",{className:"col-xs-2"},this.props.HeaderInfo.CoordinateSpace),React.createElement("th",{className:"col-xs-2 info"},"Inserted Date"),React.createElement("td",{className:"col-xs-2"},this.props.HeaderInfo.InsertedDate)),React.createElement("tr",null,React.createElement("th",{className:"col-xs-2 info"},"Protocol"),React.createElement("td",{className:"col-xs-2"},this.props.HeaderInfo.AcquisitionProtocol),React.createElement("th",{className:"col-xs-2 info"},"Series Description"),React.createElement("td",{className:"col-xs-2"},this.props.HeaderInfo.SeriesDescription),React.createElement("th",{className:"col-xs-2 info"},"Series Number"),React.createElement("td",{className:"col-xs-2"},this.props.HeaderInfo.SeriesNumber)),React.createElement("tr",null,React.createElement("th",{className:"col-xs-2 info"},"Echo Time"),React.createElement("td",{className:"col-xs-2"},this.props.HeaderInfo.EchoTime," ms"),React.createElement("th",{className:"col-xs-2 info"},"Rep Time"),React.createElement("td",{className:"col-xs-2"},this.props.HeaderInfo.RepetitionTime," ms"),React.createElement("th",{className:"col-xs-2 info"},"Slice Thick"),React.createElement("td",{className:"col-xs-2"},this.props.HeaderInfo.SliceThickness," mm")),React.createElement("tr",null,React.createElement("th",{className:"col-xs-2 info"},"Number of volumes"),React.createElement("td",{className:"col-xs-2"},this.props.HeaderInfo.NumVolumes," volumes"),React.createElement("th",{className:"col-xs-2 info"},"Pipeline"),React.createElement("td",{className:"col-xs-2"},this.props.HeaderInfo.Pipeline),React.createElement("th",{className:"col-xs-2 info"},"Algorithm"),React.createElement("td",{className:"col-xs-2"},this.props.HeaderInfo.Algorithm)),React.createElement("tr",null,React.createElement("th",{className:"col-xs-2 info"},"Number of rejected directions"),React.createElement("td",{className:"col-xs-2"},this.props.HeaderInfo.TotalRejected),React.createElement("th",{className:"col-xs-2 info"},"Number of Interlace correlations"),React.createElement("td",{className:"col-xs-2"},this.props.HeaderInfo.InterlaceRejected),React.createElement("th",{className:"col-xs-2 info"},"Number of Gradient-wise correlations"),React.createElement("td",{className:"col-xs-2"},this.props.HeaderInfo.IntergradientRejected)),React.createElement("tr",null,React.createElement("th",{className:"col-xs-2 info"},"Number of Slicewise correlations"),React.createElement("td",{className:"col-xs-2"},this.props.HeaderInfo.SlicewiseRejected),React.createElement("th",{className:"col-xs-2 info"},"Series Instance UID"),React.createElement("td",{className:"col-xs-2",colSpan:"2"},this.props.HeaderInfo.SeriesUID),React.createElement("td",{className:"col-xs-4",colSpan:"4"}," "))))}}),ImageQCDropdown=React.createClass({displayName:"ImageQCDropdown",render:function(){var label=React.createElement("label",null,this.props.Label);this.props.url&&(label=React.createElement("label",null,React.createElement("a",{href:this.props.url},this.props.Label)));var dropdown;if(this.props.editable){var options=[];for(var key in this.props.options)this.props.options.hasOwnProperty(key)&&options.push(React.createElement("option",{key:this.props.FormName+this.props.FileID+key,className:"form-control input-sm option",value:key},this.props.options[key]));dropdown=React.createElement("select",{name:this.props.FormName+"["+this.props.FileID+"]",defaultValue:this.props.defaultValue,className:"form-control input-sm"},options)}else dropdown=React.createElement("div",{className:"col-xs-12"},this.props.defaultValue);return React.createElement("div",{className:"row"},label,dropdown)}}),ImageQCStatic=React.createClass({displayName:"ImageQCStatic",render:function(){var staticInfo;return staticInfo=React.createElement("div",{className:"col-xs-12"},this.props.defaultValue),React.createElement("div",{className:"row"},React.createElement("label",null,this.props.Label),staticInfo)}}),ImagePanelQCStatusSelector=React.createClass({displayName:"ImagePanelQCStatusSelector",render:function(){var qcStatusLabel;return qcStatusLabel=this.props.HasQCPerm&&this.props.FileNew?React.createElement("span",null,"QC Status ",React.createElement("span",{className:"text-info"},"( ",React.createElement("span",{className:"glyphicon glyphicon-star"})," New )")):"QC Status",React.createElement(ImageQCDropdown,{Label:qcStatusLabel,FormName:"status",FileID:this.props.FileID,editable:this.props.HasQCPerm,defaultValue:this.props.QCStatus,options:{"":"",Pass:"Pass",Fail:"Fail"}})}}),ImagePanelQCSelectedSelector=React.createClass({displayName:"ImagePanelQCSelectedSelector",render:function(){return React.createElement(ImageQCDropdown,{Label:"Selected",FormName:"selectedvol",FileID:this.props.FileID,editable:this.props.HasQCPerm,options:{"":"",true:"True",false:"False"},defaultValue:this.props.Selected})}}),ImagePanelQCCaveatSelector=React.createClass({displayName:"ImagePanelQCCaveatSelector",render:function(){var mriViolationsLink=null;return this.props.SeriesUID&&"1"===this.props.Caveat&&(mriViolationsLink="/mri_violations/?submenu=mri_protocol_check_violations&SeriesUID="+this.props.SeriesUID+"&filter=true"),React.createElement(ImageQCDropdown,{Label:"Caveat",FormName:"caveat",FileID:this.props.FileID,editable:this.props.HasQCPerm,options:{"":"",1:"True",0:"False"},defaultValue:this.props.Caveat,url:mriViolationsLink})}}),ImagePanelQCSNRValue=React.createClass({displayName:"ImagePanelQCSNRValue",render:function(){return React.createElement(ImageQCStatic,{Label:"SNR",FormName:"snr",FileID:this.props.FileID,defaultValue:this.props.SNR})}}),ImagePanelQCPanel=React.createClass({displayName:"ImagePanelQCPanel",mixins:[React.addons.PureRenderMixin],render:function(){return React.createElement("div",{className:"form-group"},React.createElement(ImagePanelQCStatusSelector,{FileID:this.props.FileID,HasQCPerm:this.props.HasQCPerm,QCStatus:this.props.QCStatus,FileNew:this.props.FileNew}),React.createElement(ImagePanelQCSelectedSelector,{FileID:this.props.FileID,HasQCPerm:this.props.HasQCPerm,Selected:this.props.Selected}),React.createElement(ImagePanelQCCaveatSelector,{FileID:this.props.FileID,HasQCPerm:this.props.HasQCPerm,Caveat:this.props.Caveat,SeriesUID:this.props.SeriesUID}),React.createElement(ImagePanelQCSNRValue,{FileID:this.props.FileID,SNR:this.props.SNR}))}}),DownloadButton=React.createClass({displayName:"DownloadButton",render:function(){if(!this.props.FileName||""===this.props.FileName)return React.createElement("span",null);var style={margin:6};return React.createElement("a",{href:this.props.BaseURL+"/mri/jiv/get_file.php?file="+this.props.FileName,className:"btn btn-default",style:style},React.createElement("span",{className:"glyphicon glyphicon-download-alt"}),React.createElement("span",{className:"hidden-xs"},this.props.Label))}}),ImageQCCommentsButton=React.createClass({displayName:"ImageQCCommentsButton",openWindowHandler:function(e){e.preventDefault(),window.open(this.props.BaseURL+"/feedback_mri_popup.php?fileID="+this.props.FileID,"feedback_mri","width=500,height=800,toolbar=no,location=no,status=yes,scrollbars=yes,resizable=yes")},render:function(){return this.props.FileID&&""!==this.props.FileID?React.createElement("a",{className:"btn btn-default",href:"#noID",onClick:this.openWindowHandler},React.createElement("span",{className:"text-default"},React.createElement("span",{className:"glyphicon glyphicon-pencil"}),React.createElement("span",{className:"hidden-xs"},"QC Comments"))):React.createElement("span",null)}}),LongitudinalViewButton=React.createClass({displayName:"LongitudinalViewButton",openWindowHandler:function(e){e.preventDefault(),window.open(this.props.BaseURL+"/brainbrowser/?minc_id=["+this.props.OtherTimepoints+"]","BrainBrowser Volume Viewer","location = 0,width = auto, height = auto, scrollbars=yes")},render:function(){return this.props.FileID&&""!==this.props.FileID?React.createElement("a",{className:"btn btn-default",href:"#noID",onClick:this.openWindowHandler},React.createElement("span",{className:"text-default"},React.createElement("span",{className:"glyphicon glyphicon-eye-open"}),React.createElement("span",{className:"hidden-xs"},"Longitudinal View"))):React.createElement("span",null)}}),ImageDownloadButtons=React.createClass({displayName:"ImageDownloadButtons",render:function(){return React.createElement("div",{className:"row mri-second-row-panel col-xs-12"},React.createElement(ImageQCCommentsButton,{FileID:this.props.FileID,BaseURL:this.props.BaseURL}),React.createElement(DownloadButton,{FileName:this.props.Fullname,Label:"Download Minc",BaseURL:this.props.BaseURL}),React.createElement(DownloadButton,{FileName:this.props.XMLProtocol,BaseURL:this.props.BaseURL,Label:"Download XML Protocol"}),React.createElement(DownloadButton,{FileName:this.props.XMLReport,BaseURL:this.props.BaseURL,Label:"Download XML Report"}),React.createElement(DownloadButton,{FileName:this.props.NrrdFile,BaseURL:this.props.BaseURL,Label:"Download NRRD"}),React.createElement(LongitudinalViewButton,{FileID:this.props.FileID,BaseURL:this.props.BaseURL,OtherTimepoints:this.props.OtherTimepoints}))}}),ImagePanelBody=React.createClass({displayName:"ImagePanelBody",mixins:[React.addons.PureRenderMixin],openWindowHandler:function(e){e.preventDefault(),window.open(this.props.BaseURL+"/brainbrowser/?minc_id=["+this.props.FileID+"]","BrainBrowser Volume Viewer","location = 0,width = auto, height = auto, scrollbars=yes")},render:function(){return React.createElement("div",{className:"panel-body"},React.createElement("div",{className:"row"},React.createElement("div",{className:"col-xs-9 imaging_browser_pic"},React.createElement("a",{href:"#noID",onClick:this.openWindowHandler},React.createElement("img",{className:"img-checkpic img-responsive",src:this.props.Checkpic}))),React.createElement("div",{className:"col-xs-3 mri-right-panel"},React.createElement(ImagePanelQCPanel,{FileID:this.props.FileID,FileNew:this.props.FileNew,HasQCPerm:this.props.HasQCPerm,QCStatus:this.props.QCStatus,Caveat:this.props.Caveat,Selected:this.props.Selected,SNR:this.props.SNR,SeriesUID:this.props.SeriesUID}))),React.createElement(ImageDownloadButtons,{BaseURL:this.props.BaseURL,FileID:this.props.FileID,Fullname:this.props.Fullname,XMLProtocol:this.props.XMLProtocol,XMLReport:this.props.XMLReport,NrrdFile:this.props.NrrdFile,OtherTimepoints:this.props.OtherTimepoints}),this.props.HeadersExpanded?React.createElement(ImagePanelHeadersTable,{HeaderInfo:this.props.HeaderInfo}):"")}}),ImagePanel=React.createClass({displayName:"ImagePanel",getInitialState:function(){return{BodyCollapsed:!1,HeadersCollapsed:!0}},toggleBody:function(e){this.setState({BodyCollapsed:!this.state.BodyCollapsed})},toggleHeaders:function(e){this.setState({HeadersCollapsed:!this.state.HeadersCollapsed})},render:function(){return React.createElement("div",{className:"col-xs-12 col-md-6"},React.createElement("div",{className:"panel panel-default"},React.createElement(ImagePanelHeader,{FileID:this.props.FileID,Filename:this.props.Filename,QCStatus:this.props.QCStatus,onToggleBody:this.toggleBody,onToggleHeaders:this.toggleHeaders,Expanded:!this.state.BodyCollapsed,HeadersExpanded:!this.state.HeadersCollapsed}),this.state.BodyCollapsed?"":React.createElement(ImagePanelBody,{BaseURL:this.props.BaseURL,FileID:this.props.FileID,Filename:this.props.Filename,Checkpic:this.props.Checkpic,HeadersExpanded:!this.state.HeadersCollapsed,HeaderInfo:this.props.HeaderInfo,FileNew:this.props.FileNew,HasQCPerm:this.props.HasQCPerm,QCStatus:this.props.QCStatus,Caveat:this.props.Caveat,Selected:this.props.Selected,SNR:this.props.SNR,Fullname:this.props.Fullname,XMLProtocol:this.props.XMLProtocol,XMLReport:this.props.XMLReport,NrrdFile:this.props.NrrdFile,OtherTimepoints:this.props.OtherTimepoints,SeriesUID:this.props.SeriesUID})))}}),RImagePanel=React.createFactory(ImagePanel);window.ImagePanelHeader=ImagePanelHeader,window.ImagePanelHeadersTable=ImagePanelHeadersTable,window.ImageQCDropdown=ImageQCDropdown,window.ImageQCStatic=ImageQCStatic,window.ImagePanelQCStatusSelector=ImagePanelQCStatusSelector,window.ImagePanelQCSelectedSelector=ImagePanelQCSelectedSelector,window.ImagePanelQCCaveatSelector=ImagePanelQCCaveatSelector,window.ImagePanelQCSNRValue=ImagePanelQCSNRValue,window.ImagePanelQCPanel=ImagePanelQCPanel,window.DownloadButton=DownloadButton,window.ImageQCCommentsButton=ImageQCCommentsButton,window.LongitudinalViewButton=LongitudinalViewButton,window.ImageDownloadButtons=ImageDownloadButtons,window.ImagePanelBody=ImagePanelBody,window.RImagePanel=RImagePanel,exports.default={ImagePanelHeader:ImagePanelHeader,ImagePanelHeadersTable:ImagePanelHeadersTable,ImageQCDropdown:ImageQCDropdown,ImageQCStatic:ImageQCStatic,ImagePanelQCStatusSelector:ImagePanelQCStatusSelector,ImagePanelQCSelectedSelector:ImagePanelQCSelectedSelector,ImagePanelQCCaveatSelector:ImagePanelQCCaveatSelector,ImagePanelQCSNRValue:ImagePanelQCSNRValue,ImagePanelQCPanel:ImagePanelQCPanel,DownloadButton:DownloadButton,ImageQCCommentsButton:ImageQCCommentsButton,LongitudinalViewButton:LongitudinalViewButton,ImageDownloadButtons:ImageDownloadButtons,ImagePanelBody:ImagePanelBody,RImagePanel:RImagePanel}}]);
+!function(modules){function __webpack_require__(moduleId){if(installedModules[moduleId])return installedModules[moduleId].exports;var module=installedModules[moduleId]={exports:{},id:moduleId,loaded:!1};return modules[moduleId].call(module.exports,module,module.exports,__webpack_require__),module.loaded=!0,module.exports}var installedModules={};return __webpack_require__.m=modules,__webpack_require__.c=installedModules,__webpack_require__.p="",__webpack_require__(0)}([function(module,exports){"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var ImagePanelHeader=React.createClass({displayName:"ImagePanelHeader",mixins:[React.addons.PureRenderMixin],componentDidMount:function(){$(".panel-title").tooltip()},render:function(){var QCStatusLabel;"Pass"===this.props.QCStatus?QCStatusLabel=React.createElement("span",{className:"label label-success"},this.props.QCStatus):"Fail"===this.props.QCStatus&&(QCStatusLabel=React.createElement("span",{className:"label label-danger"},this.props.QCStatus));var arrow;arrow=this.props.Expanded?React.createElement("span",{onClick:this.props.onToggleBody,className:"pull-right clickable glyphicon arrow glyphicon-chevron-up"}):React.createElement("span",{onClick:this.props.onToggleBody,className:"pull-right clickable glyphicon arrow glyphicon-chevron-down"});var headerButton=React.createElement("div",{className:"pull-right"},React.createElement("div",{className:"btn-group views"},React.createElement("button",{type:"button",className:"btn btn-default btn-xs dropdown-toggle",onClick:this.props.onToggleHeaders,"aria-expanded":this.props.HeadersExpanded},"Header Info"),React.createElement("span",{className:"caret"})));return React.createElement("div",{className:"panel-heading clearfix"},React.createElement("input",{type:"checkbox","data-file-id":this.props.FileID,className:"mripanel user-success"}),React.createElement("h3",{className:"panel-title","data-toggle":"tooltip",title:this.props.Filename},this.props.Filename),QCStatusLabel,arrow,headerButton)}}),ImagePanelHeadersTable=React.createClass({displayName:"ImagePanelHeadersTable",componentDidMount:function(){$(ReactDOM.findDOMNode(this)).DynamicTable()},componentWillUnmount:function(){$(ReactDOM.findDOMNode(this)).DynamicTable({removeDynamicTable:!0})},render:function(){return React.createElement("table",{className:"table table-hover table-bordered header-info col-xs-12 dynamictable"},React.createElement("tbody",null,React.createElement("tr",null,React.createElement("th",{className:"info col-xs-2"},"Voxel Size"),React.createElement("td",{className:"col-xs-6",colSpan:"3"},""===this.props.HeaderInfo.XStep?" ":"X: "+this.props.HeaderInfo.XStep+" mm ",""===this.props.HeaderInfo.YStep?" ":"Y: "+this.props.HeaderInfo.YStep+" mm ",""===this.props.HeaderInfo.ZStep?" ":"Z: "+this.props.HeaderInfo.ZStep+" mm "),React.createElement("th",{className:"col-xs-2 info"},"Output Type"),React.createElement("td",{className:"col-xs-2"},this.props.HeaderInfo.OutputType)),React.createElement("tr",null,React.createElement("th",{className:"col-xs-2 info"},"Acquisition Date"),React.createElement("td",{className:"col-xs-2"},this.props.HeaderInfo.AcquisitionDate),React.createElement("th",{className:"col-xs-2 info"},"Space"),React.createElement("td",{className:"col-xs-2"},this.props.HeaderInfo.CoordinateSpace),React.createElement("th",{className:"col-xs-2 info"},"Inserted Date"),React.createElement("td",{className:"col-xs-2"},this.props.HeaderInfo.InsertedDate)),React.createElement("tr",null,React.createElement("th",{className:"col-xs-2 info"},"Protocol"),React.createElement("td",{className:"col-xs-2"},this.props.HeaderInfo.AcquisitionProtocol),React.createElement("th",{className:"col-xs-2 info"},"Series Description"),React.createElement("td",{className:"col-xs-2"},this.props.HeaderInfo.SeriesDescription),React.createElement("th",{className:"col-xs-2 info"},"Series Number"),React.createElement("td",{className:"col-xs-2"},this.props.HeaderInfo.SeriesNumber)),React.createElement("tr",null,React.createElement("th",{className:"col-xs-2 info"},"Echo Time"),React.createElement("td",{className:"col-xs-2"},this.props.HeaderInfo.EchoTime," ms"),React.createElement("th",{className:"col-xs-2 info"},"Rep Time"),React.createElement("td",{className:"col-xs-2"},this.props.HeaderInfo.RepetitionTime," ms"),React.createElement("th",{className:"col-xs-2 info"},"Slice Thick"),React.createElement("td",{className:"col-xs-2"},this.props.HeaderInfo.SliceThickness," mm")),React.createElement("tr",null,React.createElement("th",{className:"col-xs-2 info"},"Number of volumes"),React.createElement("td",{className:"col-xs-2"},this.props.HeaderInfo.NumVolumes," volumes"),React.createElement("th",{className:"col-xs-2 info"},"Pipeline"),React.createElement("td",{className:"col-xs-2"},this.props.HeaderInfo.Pipeline),React.createElement("th",{className:"col-xs-2 info"},"Algorithm"),React.createElement("td",{className:"col-xs-2"},this.props.HeaderInfo.Algorithm)),React.createElement("tr",null,React.createElement("th",{className:"col-xs-2 info"},"Number of rejected directions"),React.createElement("td",{className:"col-xs-2"},this.props.HeaderInfo.TotalRejected),React.createElement("th",{className:"col-xs-2 info"},"Number of Interlace correlations"),React.createElement("td",{className:"col-xs-2"},this.props.HeaderInfo.InterlaceRejected),React.createElement("th",{className:"col-xs-2 info"},"Number of Gradient-wise correlations"),React.createElement("td",{className:"col-xs-2"},this.props.HeaderInfo.IntergradientRejected)),React.createElement("tr",null,React.createElement("th",{className:"col-xs-2 info"},"Number of Slicewise correlations"),React.createElement("td",{className:"col-xs-2"},this.props.HeaderInfo.SlicewiseRejected),React.createElement("th",{className:"col-xs-2 info"},"Series Instance UID"),React.createElement("td",{className:"col-xs-2",colSpan:"2"},this.props.HeaderInfo.SeriesUID),React.createElement("td",{className:"col-xs-4",colSpan:"4"}," "))))}}),ImageQCDropdown=React.createClass({displayName:"ImageQCDropdown",render:function(){var label=React.createElement("label",null,this.props.Label);this.props.url&&(label=React.createElement("label",null,React.createElement("a",{href:this.props.url},this.props.Label)));var dropdown;if(this.props.editable){var options=[];for(var key in this.props.options)this.props.options.hasOwnProperty(key)&&options.push(React.createElement("option",{key:this.props.FormName+this.props.FileID+key,className:"form-control input-sm option",value:key},this.props.options[key]));dropdown=React.createElement("select",{name:this.props.FormName+"["+this.props.FileID+"]",defaultValue:this.props.defaultValue,className:"form-control input-sm"},options)}else dropdown=React.createElement("div",{className:"col-xs-12"},this.props.defaultValue);return React.createElement("div",{className:"row"},label,dropdown)}}),ImageQCStatic=React.createClass({displayName:"ImageQCStatic",render:function(){var staticInfo;return staticInfo=React.createElement("div",{className:"col-xs-12"},this.props.defaultValue),React.createElement("div",{className:"row"},React.createElement("label",null,this.props.Label),staticInfo)}}),ImagePanelQCStatusSelector=React.createClass({displayName:"ImagePanelQCStatusSelector",render:function(){var qcStatusLabel;return qcStatusLabel=this.props.HasQCPerm&&this.props.FileNew?React.createElement("span",null,"QC Status ",React.createElement("span",{className:"text-info"},"( ",React.createElement("span",{className:"glyphicon glyphicon-star"})," New )")):"QC Status",React.createElement(ImageQCDropdown,{Label:qcStatusLabel,FormName:"status",FileID:this.props.FileID,editable:this.props.HasQCPerm,defaultValue:this.props.QCStatus,options:{"":"",Pass:"Pass",Fail:"Fail"}})}}),ImagePanelQCSelectedSelector=React.createClass({displayName:"ImagePanelQCSelectedSelector",render:function(){return React.createElement(ImageQCDropdown,{Label:"Selected",FormName:"selectedvol",FileID:this.props.FileID,editable:this.props.HasQCPerm,options:{"":"",true:"True",false:"False"},defaultValue:this.props.Selected})}}),ImagePanelQCCaveatSelector=React.createClass({displayName:"ImagePanelQCCaveatSelector",render:function(){var mriViolationsLink=null;return this.props.SeriesUID&&"1"===this.props.Caveat&&(mriViolationsLink="/mri_violations/?submenu=mri_protocol_check_violations&SeriesUID="+this.props.SeriesUID+"&filter=true"),React.createElement(ImageQCDropdown,{Label:"Caveat",FormName:"caveat",FileID:this.props.FileID,editable:this.props.HasQCPerm,options:{"":"",1:"True",0:"False"},defaultValue:this.props.Caveat,url:mriViolationsLink})}}),ImagePanelQCSNRValue=React.createClass({displayName:"ImagePanelQCSNRValue",render:function(){return React.createElement(ImageQCStatic,{Label:"SNR",FormName:"snr",FileID:this.props.FileID,defaultValue:this.props.SNR})}}),ImagePanelQCPanel=React.createClass({displayName:"ImagePanelQCPanel",mixins:[React.addons.PureRenderMixin],render:function(){return React.createElement("div",{className:"form-group"},React.createElement(ImagePanelQCStatusSelector,{FileID:this.props.FileID,HasQCPerm:this.props.HasQCPerm,QCStatus:this.props.QCStatus,FileNew:this.props.FileNew}),React.createElement(ImagePanelQCSelectedSelector,{FileID:this.props.FileID,HasQCPerm:this.props.HasQCPerm,Selected:this.props.Selected}),React.createElement(ImagePanelQCCaveatSelector,{FileID:this.props.FileID,HasQCPerm:this.props.HasQCPerm,Caveat:this.props.Caveat,SeriesUID:this.props.SeriesUID}),React.createElement(ImagePanelQCSNRValue,{FileID:this.props.FileID,SNR:this.props.SNR}))}}),DownloadButton=React.createClass({displayName:"DownloadButton",render:function(){if(!this.props.FileName||""===this.props.FileName)return React.createElement("span",null);var style={margin:6};return React.createElement("a",{href:this.props.BaseURL+"/mri/jiv/get_file.php?file="+this.props.FileName,className:"btn btn-default",style:style},React.createElement("span",{className:"glyphicon glyphicon-download-alt"}),React.createElement("span",{className:"hidden-xs"},this.props.Label))}}),ImageQCCommentsButton=React.createClass({displayName:"ImageQCCommentsButton",openWindowHandler:function(e){e.preventDefault(),window.open(this.props.BaseURL+"/feedback_mri_popup.php?fileID="+this.props.FileID,"feedback_mri","width=500,height=800,toolbar=no,location=no,status=yes,scrollbars=yes,resizable=yes")},render:function(){return this.props.FileID&&""!==this.props.FileID?React.createElement("a",{className:"btn btn-default",href:"#noID",onClick:this.openWindowHandler},React.createElement("span",{className:"text-default"},React.createElement("span",{className:"glyphicon glyphicon-pencil"}),React.createElement("span",{className:"hidden-xs"},"QC Comments"))):React.createElement("span",null)}}),LongitudinalViewButton=React.createClass({displayName:"LongitudinalViewButton",openWindowHandler:function(e){e.preventDefault(),window.open(this.props.BaseURL+"/brainbrowser/?minc_id=["+this.props.OtherTimepoints+"]","BrainBrowser Volume Viewer","location = 0,width = auto, height = auto, scrollbars=yes")},render:function(){return this.props.FileID&&""!==this.props.FileID?React.createElement("a",{className:"btn btn-default",href:"#noID",onClick:this.openWindowHandler},React.createElement("span",{className:"text-default"},React.createElement("span",{className:"glyphicon glyphicon-eye-open"}),React.createElement("span",{className:"hidden-xs"},"Longitudinal View"))):React.createElement("span",null)}}),ImageDownloadButtons=React.createClass({displayName:"ImageDownloadButtons",render:function(){return React.createElement("div",{className:"row mri-second-row-panel col-xs-12"},React.createElement(ImageQCCommentsButton,{FileID:this.props.FileID,BaseURL:this.props.BaseURL}),React.createElement(DownloadButton,{FileName:this.props.Fullname,Label:"Download Minc",BaseURL:this.props.BaseURL}),React.createElement(DownloadButton,{FileName:this.props.XMLProtocol,BaseURL:this.props.BaseURL,Label:"Download XML Protocol"}),React.createElement(DownloadButton,{FileName:this.props.XMLReport,BaseURL:this.props.BaseURL,Label:"Download XML Report"}),React.createElement(DownloadButton,{FileName:this.props.NrrdFile,BaseURL:this.props.BaseURL,Label:"Download NRRD"}),React.createElement(LongitudinalViewButton,{FileID:this.props.FileID,BaseURL:this.props.BaseURL,OtherTimepoints:this.props.OtherTimepoints}))}}),ImagePanelBody=React.createClass({displayName:"ImagePanelBody",mixins:[React.addons.PureRenderMixin],openWindowHandler:function(e){e.preventDefault(),window.open(this.props.BaseURL+"/brainbrowser/?minc_id=["+this.props.FileID+"]","BrainBrowser Volume Viewer","location = 0,width = auto, height = auto, scrollbars=yes")},render:function(){return React.createElement("div",{className:"panel-body"},React.createElement("div",{className:"row"},React.createElement("div",{className:"col-xs-9 imaging_browser_pic"},React.createElement("a",{href:"#noID",onClick:this.openWindowHandler},React.createElement("img",{className:"img-checkpic img-responsive",src:this.props.Checkpic}))),React.createElement("div",{className:"col-xs-3 mri-right-panel"},React.createElement(ImagePanelQCPanel,{FileID:this.props.FileID,FileNew:this.props.FileNew,HasQCPerm:this.props.HasQCPerm,QCStatus:this.props.QCStatus,Caveat:this.props.Caveat,Selected:this.props.Selected,SNR:this.props.SNR,SeriesUID:this.props.SeriesUID}))),React.createElement(ImageDownloadButtons,{BaseURL:this.props.BaseURL,FileID:this.props.FileID,Fullname:this.props.Fullname,XMLProtocol:this.props.XMLProtocol,XMLReport:this.props.XMLReport,NrrdFile:this.props.NrrdFile,OtherTimepoints:this.props.OtherTimepoints}),this.props.HeadersExpanded?React.createElement(ImagePanelHeadersTable,{HeaderInfo:this.props.HeaderInfo}):"")}}),ImagePanel=React.createClass({displayName:"ImagePanel",getInitialState:function(){return{BodyCollapsed:!1,HeadersCollapsed:!0}},toggleBody:function(e){this.setState({BodyCollapsed:!this.state.BodyCollapsed})},toggleHeaders:function(e){this.setState({HeadersCollapsed:!this.state.HeadersCollapsed})},render:function(){return React.createElement("div",{className:"col-xs-12 col-md-6"},React.createElement("div",{className:"panel panel-default"},React.createElement(ImagePanelHeader,{FileID:this.props.FileID,Filename:this.props.Filename,QCStatus:this.props.QCStatus,onToggleBody:this.toggleBody,onToggleHeaders:this.toggleHeaders,Expanded:!this.state.BodyCollapsed,HeadersExpanded:!this.state.HeadersCollapsed}),this.state.BodyCollapsed?"":React.createElement(ImagePanelBody,{BaseURL:this.props.BaseURL,FileID:this.props.FileID,Filename:this.props.Filename,Checkpic:this.props.Checkpic,HeadersExpanded:!this.state.HeadersCollapsed,HeaderInfo:this.props.HeaderInfo,FileNew:this.props.FileNew,HasQCPerm:this.props.HasQCPerm,QCStatus:this.props.QCStatus,Caveat:this.props.Caveat,Selected:this.props.Selected,SNR:this.props.SNR,Fullname:this.props.Fullname,XMLProtocol:this.props.XMLProtocol,XMLReport:this.props.XMLReport,NrrdFile:this.props.NrrdFile,OtherTimepoints:this.props.OtherTimepoints,SeriesUID:this.props.SeriesUID})))}}),RImagePanel=React.createFactory(ImagePanel);window.ImagePanelHeader=ImagePanelHeader,window.ImagePanelHeadersTable=ImagePanelHeadersTable,window.ImageQCDropdown=ImageQCDropdown,window.ImageQCStatic=ImageQCStatic,window.ImagePanelQCStatusSelector=ImagePanelQCStatusSelector,window.ImagePanelQCSelectedSelector=ImagePanelQCSelectedSelector,window.ImagePanelQCCaveatSelector=ImagePanelQCCaveatSelector,window.ImagePanelQCSNRValue=ImagePanelQCSNRValue,window.ImagePanelQCPanel=ImagePanelQCPanel,window.DownloadButton=DownloadButton,window.ImageQCCommentsButton=ImageQCCommentsButton,window.LongitudinalViewButton=LongitudinalViewButton,window.ImageDownloadButtons=ImageDownloadButtons,window.ImagePanelBody=ImagePanelBody,window.RImagePanel=RImagePanel,exports.default={ImagePanelHeader:ImagePanelHeader,ImagePanelHeadersTable:ImagePanelHeadersTable,ImageQCDropdown:ImageQCDropdown,ImageQCStatic:ImageQCStatic,ImagePanelQCStatusSelector:ImagePanelQCStatusSelector,ImagePanelQCSelectedSelector:ImagePanelQCSelectedSelector,ImagePanelQCCaveatSelector:ImagePanelQCCaveatSelector,ImagePanelQCSNRValue:ImagePanelQCSNRValue,ImagePanelQCPanel:ImagePanelQCPanel,DownloadButton:DownloadButton,ImageQCCommentsButton:ImageQCCommentsButton,LongitudinalViewButton:LongitudinalViewButton,ImageDownloadButtons:ImageDownloadButtons,ImagePanelBody:ImagePanelBody,RImagePanel:RImagePanel}}]);
 //# sourceMappingURL=ImagePanel.js.map
\ No newline at end of file
diff --git a/modules/imaging_browser/jsx/ImagePanel.js b/modules/imaging_browser/jsx/ImagePanel.js
index 2552ddf1fc9..46cf2606c87 100644
--- a/modules/imaging_browser/jsx/ImagePanel.js
+++ b/modules/imaging_browser/jsx/ImagePanel.js
@@ -6,6 +6,9 @@
 
 var ImagePanelHeader = React.createClass({
   mixins: [React.addons.PureRenderMixin],
+  componentDidMount: function() {
+    $(".panel-title").tooltip();
+  },
   render: function() {
     var QCStatusLabel;
     if (this.props.QCStatus === 'Pass') {
@@ -47,7 +50,9 @@ var ImagePanelHeader = React.createClass({
             <div className="panel-heading clearfix">
             <input type="checkbox" data-file-id={this.props.FileID}
                      className="mripanel user-success" />
-                <h3 className="panel-title">{this.props.Filename} </h3>
+                <h3 className="panel-title" data-toggle="tooltip" title={this.props.Filename}>
+                  {this.props.Filename}
+                </h3>
                 {QCStatusLabel}
                 {arrow}
                 {headerButton}
diff --git a/modules/imaging_browser/php/imaging_browser.class.inc b/modules/imaging_browser/php/imaging_browser.class.inc
index 33f000c87cf..3dae8895475 100644
--- a/modules/imaging_browser/php/imaging_browser.class.inc
+++ b/modules/imaging_browser/php/imaging_browser.class.inc
@@ -50,7 +50,7 @@ class Imaging_Browser extends \NDB_Menu_Filter
      * Set up the variables required by NDB_Menu_Filter class for constructing
      * a query
      *
-     * @return null
+     * @return void
      */
     function _setupVariables()
     {
@@ -290,7 +290,7 @@ class Imaging_Browser extends \NDB_Menu_Filter
     /**
      * Setup $this->tpl_data for use by Smarty
      *
-     * @return null
+     * @return void
      */
     function setup()
     {
@@ -422,7 +422,7 @@ class Imaging_Browser extends \NDB_Menu_Filter
      * @param string $field        filter field
      * @param string $val          filter value
      *
-     * @return null
+     * @return string the new query
      */
     function _addValidFilters($prepared_key, $field, $val)
     {
@@ -473,7 +473,7 @@ class Imaging_Browser extends \NDB_Menu_Filter
      *         will be used for the Navigation Links in  the viewSession
      *         page.
      *
-     * @return associative array
+     * @return array
      */
     function toArray()
     {
diff --git a/modules/imaging_browser/php/imaging_session_controlpanel.class.inc b/modules/imaging_browser/php/imaging_session_controlpanel.class.inc
index 6a1e88e73b0..40db45ffa1e 100644
--- a/modules/imaging_browser/php/imaging_session_controlpanel.class.inc
+++ b/modules/imaging_browser/php/imaging_session_controlpanel.class.inc
@@ -63,25 +63,34 @@ class Imaging_Session_ControlPanel
     function getData()
     {
         $DB        = \Database::singleton();
+        $config    = \NDB_Config::singleton();
         $timePoint =& \TimePoint::singleton($_REQUEST['sessionID']);
 
         $subjectData['sessionID'] = $_REQUEST['sessionID'];
         $subjectData['candid']    = $timePoint->getCandID();
 
-        $qresult = $DB->pselectOne(
-            "SELECT CommentID FROM flag 
-            WHERE Test_name='mri_parameter_form' AND SessionID = :v_sessions_id",
-            array('v_sessions_id' => $this->sessionID)
-        );
-        $subjectData['ParameterFormCommentID'] = (empty($qresult)) ? "" : $qresult;
-
-        $qresult = $DB->pselectOne(
-            "SELECT CommentID 
-            FROM flag WHERE Test_name='radiology_review' 
-            AND SessionID = :v_sessions_id",
-            array('v_sessions_id' => $this->sessionID)
-        );
-        $subjectData['RadiologyReviewCommentID'] = (empty($qresult)) ? "" : $qresult;
+        $linkedInstruments
+            = $config->getSetting('ImagingBrowserLinkedInstruments');
+
+        $links = array();
+        foreach ($linkedInstruments as $k=>$v) {
+            $qresult = $DB->pselectRow(
+                "SELECT f.CommentID, tn.Full_name FROM flag f
+            JOIN test_names tn ON f.Test_name = tn.Test_name 
+            WHERE f.Test_name = :tname AND f.SessionID = :v_sessions_id",
+                array(
+                 'tname'         => $v,
+                 'v_sessions_id' => $this->sessionID,
+                )
+            );
+            $links[] = array(
+                        "FEName"    => $qresult['Full_name'],
+                        "BEName"    => $v,
+                        "CommentID" => $qresult['CommentID'],
+                       );
+        }
+        $subjectData['links']
+            = (empty($links)) ? "" : $links;
 
         $candidate =& \Candidate::singleton($timePoint->getCandID());
 
@@ -97,7 +106,7 @@ class Imaging_Session_ControlPanel
             $params['PVL']     = $timePoint->getVisitLabel();
         }
         $tarchiveIDs = $DB->pselect(
-            "SELECT TarchiveID 
+            "SELECT TarchiveID
             FROM tarchive 
             WHERE PatientName LIKE $ID",
             $params
diff --git a/modules/imaging_browser/php/viewsession.class.inc b/modules/imaging_browser/php/viewsession.class.inc
index 477a6be0ae1..eddb4600de1 100644
--- a/modules/imaging_browser/php/viewsession.class.inc
+++ b/modules/imaging_browser/php/viewsession.class.inc
@@ -78,7 +78,7 @@ class ViewSession extends \NDB_Form
     /**
      * Sets up main parameters
      *
-     * @return NULL
+     * @return void
      */
     function setup()
     {
@@ -740,7 +740,7 @@ class ViewSession extends \NDB_Form
     /**
      * Get js Dependencies
      *
-     * @return string
+     * @return array
      */
     function getJSDependencies()
     {
diff --git a/modules/imaging_browser/templates/imaging_session_controlpanel.tpl b/modules/imaging_browser/templates/imaging_session_controlpanel.tpl
index 7a502faff24..69bbac02478 100644
--- a/modules/imaging_browser/templates/imaging_session_controlpanel.tpl
+++ b/modules/imaging_browser/templates/imaging_session_controlpanel.tpl
@@ -32,12 +32,9 @@
 
     <h3>Links</h3>
     <ul>
-        {if $mri_param_form_table_exists}
-            <li><a href="{$baseurl}/{$subject.candid}/{$subject.sessionID}/mri_parameter_form/?commentID={$subject.ParameterFormCommentID}">MRI Parameter Form</a></li>
-        {/if}
-        {if $rad_review_table_exists}
-            <li><a href="{$baseurl}/{$subject.candid}/{$subject.sessionID}/radiology_review/?commentID={$subject.RadiologyReviewCommentID}">Radiology Review</a></li>
-        {/if}
+        {foreach from=$subject.links item=link}
+            <li><a href="{$baseurl}/{$subject.candid}/{$subject.sessionID}/{$link.BEName}/?commentID={$link.CommentID}">{$link.FEName}</a></li>
+        {/foreach}
         {foreach from=$subject.tarchiveids item=tarchive}
         <li><a href="{$baseurl}/dicom_archive/viewDetails/?tarchiveID={$tarchive.TarchiveID}&backURL={$backURL|escape:"url"}">DICOM Archive {$tarchive.TarchiveID}</a></li>{/foreach}
         {if $issue_tracker_url}
diff --git a/modules/imaging_browser/test/imaging_browser_test_plan.md b/modules/imaging_browser/test/imaging_browser_test_plan.md
index 66134569eba..28cded7e1d6 100644
--- a/modules/imaging_browser/test/imaging_browser_test_plan.md
+++ b/modules/imaging_browser/test/imaging_browser_test_plan.md
@@ -11,7 +11,7 @@
 
 ### B. ViewSession / Volume List
 
-8. Sidebar:  all links work 
+8. Sidebar:  all links work. Ensure that projects can customize (add/remove) their list of instruments that can be linked to from the Configuration/Imaging Modules/Imaging Browser Links to Insruments
 9. 3d panel overlay etc - they work.  Add panel checkbox works. 3D only or 3D+Overlay loads files if at least one image exists and is selected
 10. "Visit Level Feedback" - pops up QC window (see section E below)
 11. Visit level QC controls (Pass/Fail, Pending, Visit Level Caveat) viewable to all, editable IFF permission imaging_browser_qc
diff --git a/modules/imaging_uploader/README.md b/modules/imaging_uploader/README.md
index 3f66e169733..dc94a41544d 100644
--- a/modules/imaging_uploader/README.md
+++ b/modules/imaging_uploader/README.md
@@ -1,14 +1,106 @@
-To enable the Imaging Uploader to handle large files, please update the apache configuration file
-with the following values.
+# Imaging Uploader
 
-File to update : `/etc/php5/apache2/php.ini`
+## Purpose
 
-Sample values: 
+The imaging uploader is intended to allow users to upload, browse, and track 
+pipeline insertion progress.
+
+
+## Intended Users
+
+The primary users are MRI technicians or site coordinators uploading imaging 
+scans for registered LORIS candidates and timepoints.
+
+## Scope
+
+The imaging uploader has the following built-in capabilities to facilitate 
+timely scan insertion into the LORIS database. Specifically, it allows to browse
+uploaded scans using the `Browse` tab, upload imaging scans using the `Upload` 
+tab, and track scan insertion status through the `Progress` column and a 
+`Log Viewer` which displays in either `Summary` or `Detailed` mode relevant 
+feedback messages about insertion success or failure causes.
+
+Uploaded scans can be overwritten if insertion status is `Not Started` or 
+`Failed` (i.e. if the `Progress` is neither `In Progress` nor `Success`). 
+
+
+NOT in scope:
+
+The imaging uploader does NOT read the DICOM files within the uploaded scans. 
+As such, it does not check if the files within the uploaded scan are of the 
+expected DICOM type, nor whether the  PatientName and/or PatientID DICOM headers 
+are properly de-identified according to the LORIS convention. This check is 
+however done as the first step on the LORIS-MRI side; i.e. as soon as the 
+insertion pipeline is triggered.
+
+## Requirements
+
+For a successful upload:
+- The uploaded file is expected to be of one of the following types: 
+`.tgz`, `.tar.gz` or `.zip`.
+- The filename should follow the:
+`PSCID_CandID_VisitLabel_OptionalSuffix` naming convention
+- It is expected that the candidate and timepoint are already created in the 
+database.
+
+
+## Permissions
+
+#### Module Permission
+
+The imaging uploader module uses one permission called `imaging_uploader` that 
+is necessary to have access to the module and gives the user the ability to 
+upload and browse all scans uploaded to the database.
+
+#### Filesystem Permission
+
+The path on the filesystem where the uploaded file go 
+(see section [Database Configuration](#database_config_link)) should be 
+readable and writable by the web server. This is automatically achieved by the 
+LORIS-MRI install process.
+
+
+## Configurations
+
+The imaging uploader has the following configurations that affect its usage:
+
+#### Install Configurations
+
+To enable the Imaging Uploader to handle large files, please update the 
+`php.ini` apache configuration file. Recommended sample values appropriate for 
+compressed scans not exceeding 500M in size are: 
 
 ```
-session.gc_maxlifetime = 10800
-max_input_time = 10800
-max_execution_time = 10800
-upload_max_filesize = 1024M
-post_max_size = 1024M
+session.gc_maxlifetime = 10800  // After this number of seconds, stored data will be seen as 'garbage' and cleaned up by the garbage collection process.
+max_input_time = 10800          // Maximum amount of time each script may spend parsing request data (in seconds)
+max_execution_time = 10800      // Maximum execution time of each script (in seconds)
+upload_max_filesize = 1024M     // Maximum allowed size for uploaded files.
+post_max_size = 1024M           // Maximum size of POST data that PHP will accept.
 ```
+
+#### <a name="database_config_link"></a> Database Configurations
+
+ImagingUploaderAutoLaunch - This setting determines whether the insertion 
+        pipeline that archives the scans is triggered automatically or manually.
+
+MRIUploadIncomingPath - This setting determines where on the filesystem the 
+        uploader is to place the uploaded scan. Default location is 
+        `/data/incoming/`. This directory is created during the installation of 
+        LORIS-MRI. 
+        **Note**: Uploaded scans are erased from the 
+        `MRIUploadIncomingPath`following a successful archival and insertion 
+        through the LORIS-MRI pipeline. 
+
+
+## Interactions with LORIS
+
+- The `TarchiveInfo` column links to the DICOM Archive module for that scan
+- The `Number of MincInserted` column links to the Imaging Browser module for 
+that candidate's session 
+- The `Number of MincCreated` column links to the MRI Violated scans module if
+violated scans (i.e. scans that violate the MRI protocol as defined by the 
+study) are present
+- If `ImagingUploaderAutoLaunch` configuration is enabled, the Server Process
+Manager under the Admin menu can be consulted for scans insertion progress 
+(exit codes, error files, etc...). 
+
diff --git a/modules/imaging_uploader/js/index.js b/modules/imaging_uploader/js/index.js
index 62b9f6061e1..2bcec3b220d 100644
--- a/modules/imaging_uploader/js/index.js
+++ b/modules/imaging_uploader/js/index.js
@@ -1,3 +1,3 @@
-!function(modules){function __webpack_require__(moduleId){if(installedModules[moduleId])return installedModules[moduleId].exports;var module=installedModules[moduleId]={exports:{},id:moduleId,loaded:!1};return modules[moduleId].call(module.exports,module,module.exports,__webpack_require__),module.loaded=!0,module.exports}var installedModules={};return __webpack_require__.m=modules,__webpack_require__.c=installedModules,__webpack_require__.p="",__webpack_require__(0)}([function(module,exports,__webpack_require__){"use strict";function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}var _ImagingUploader=__webpack_require__(15),_ImagingUploader2=_interopRequireDefault(_ImagingUploader);$(function(){var imagingUploader=React.createElement("div",{className:"page-imaging-uploader"},React.createElement(_ImagingUploader2.default,{Module:"imaging_uploader",DataURL:loris.BaseURL+"/imaging_uploader/?format=json"}));ReactDOM.render(imagingUploader,document.getElementById("lorisworkspace"))})},,function(module,exports){"use strict";function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}Object.defineProperty(exports,"__esModule",{value:!0});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),Panel=function(_React$Component){function Panel(props){_classCallCheck(this,Panel);var _this=_possibleConstructorReturn(this,(Panel.__proto__||Object.getPrototypeOf(Panel)).call(this,props));return _this.state={collapsed:_this.props.initCollapsed},_this.panelClass=_this.props.initCollapsed?"panel-collapse collapse":"panel-collapse collapse in",_this.toggleCollapsed=_this.toggleCollapsed.bind(_this),_this}return _inherits(Panel,_React$Component),_createClass(Panel,[{key:"toggleCollapsed",value:function(){this.setState({collapsed:!this.state.collapsed})}},{key:"render",value:function(){var glyphClass=this.state.collapsed?"glyphicon pull-right glyphicon-chevron-down":"glyphicon pull-right glyphicon-chevron-up",panelHeading=this.props.title?React.createElement("div",{className:"panel-heading",onClick:this.toggleCollapsed,"data-toggle":"collapse","data-target":"#"+this.props.id,style:{cursor:"pointer"}},this.props.title,React.createElement("span",{className:glyphClass})):"";return React.createElement("div",{className:"panel panel-primary"},panelHeading,React.createElement("div",{id:this.props.id,className:this.panelClass,role:"tabpanel"},React.createElement("div",{className:"panel-body",style:{height:this.props.height}},this.props.children)))}}]),Panel}(React.Component);Panel.propTypes={id:React.PropTypes.string,height:React.PropTypes.string,title:React.PropTypes.string},Panel.defaultProps={initCollapsed:!1,id:"default-panel",height:"100%"},exports.default=Panel},,,,,,,function(module,exports){"use strict";function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}Object.defineProperty(exports,"__esModule",{value:!0});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),Tabs=function(_React$Component){function Tabs(props){_classCallCheck(this,Tabs);var _this=_possibleConstructorReturn(this,(Tabs.__proto__||Object.getPrototypeOf(Tabs)).call(this,props)),hash=window.location.hash,activeTab="";return _this.props.updateURL&&hash?activeTab=hash.substr(1):_this.props.defaultTab?activeTab=_this.props.defaultTab:_this.props.tabs.length>0&&(activeTab=_this.props.tabs[0].id),_this.state={activeTab:activeTab},_this.handleClick=_this.handleClick.bind(_this),_this.getTabs=_this.getTabs.bind(_this),_this.getTabPanes=_this.getTabPanes.bind(_this),_this}return _inherits(Tabs,_React$Component),_createClass(Tabs,[{key:"handleClick",value:function(tabId,e){if(this.setState({activeTab:tabId}),this.props.onTabChange(tabId),this.props.updateURL){var scrollDistance=$("body").scrollTop()||$("html").scrollTop();window.location.hash=e.target.hash,$("html,body").scrollTop(scrollDistance)}}},{key:"getTabs",value:function(){var tabs=this.props.tabs.map(function(tab){var tabClass=this.state.activeTab===tab.id?"active":null,href="#"+tab.id,tabID="tab-"+tab.id;return React.createElement("li",{role:"presentation",className:tabClass,key:tab.id},React.createElement("a",{id:tabID,href:href,role:"tab","data-toggle":"tab",onClick:this.handleClick.bind(null,tab.id)},tab.label))}.bind(this));return tabs}},{key:"getTabPanes",value:function(){var tabPanes=React.Children.map(this.props.children,function(child,key){if(child)return React.cloneElement(child,{activeTab:this.state.activeTab,key:key})}.bind(this));return tabPanes}},{key:"render",value:function(){var tabs=this.getTabs(),tabPanes=this.getTabPanes(),tabStyle={marginLeft:0,marginBottom:"5px"};return React.createElement("div",null,React.createElement("ul",{className:"nav nav-tabs",role:"tablist",style:tabStyle},tabs),React.createElement("div",{className:"tab-content"},tabPanes))}}]),Tabs}(React.Component);Tabs.propTypes={tabs:React.PropTypes.array.isRequired,defaultTab:React.PropTypes.string,updateURL:React.PropTypes.bool},Tabs.defaultProps={onTabChange:function(){},updateURL:!1};var TabPane=function(_React$Component2){function TabPane(){return _classCallCheck(this,TabPane),_possibleConstructorReturn(this,(TabPane.__proto__||Object.getPrototypeOf(TabPane)).apply(this,arguments))}return _inherits(TabPane,_React$Component2),_createClass(TabPane,[{key:"render",value:function(){var classList="tab-pane",title=void 0;return this.props.TabId===this.props.activeTab&&(classList+=" active"),this.props.Title&&(title=React.createElement("h1",null,this.props.Title)),React.createElement("div",{role:"tabpanel",className:classList,id:this.props.TabId},title,this.props.children)}}]),TabPane}(React.Component);TabPane.propTypes={TabId:React.PropTypes.string.isRequired,Title:React.PropTypes.string,activeTab:React.PropTypes.string},exports.Tabs=Tabs,exports.TabPane=TabPane},,,,function(module,exports,__webpack_require__){"use strict";function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}Object.defineProperty(exports,"__esModule",{value:!0});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),_Panel=__webpack_require__(2),_Panel2=_interopRequireDefault(_Panel),FilterForm=function(_React$Component){function FilterForm(props){_classCallCheck(this,FilterForm);var _this=_possibleConstructorReturn(this,(FilterForm.__proto__||Object.getPrototypeOf(FilterForm)).call(this,props));return _this.clearFilter=_this.clearFilter.bind(_this),_this.getFormChildren=_this.getFormChildren.bind(_this),_this.setFilter=_this.setFilter.bind(_this),_this.onElementUpdate=_this.onElementUpdate.bind(_this),_this.queryString=QueryString.get(),_this}return _inherits(FilterForm,_React$Component),_createClass(FilterForm,[{key:"componentDidMount",value:function(){var filter={},queryString=this.queryString;Object.keys(queryString).forEach(function(key){var filterKey="candidateID"===key?"candID":key;filter[filterKey]={value:queryString[key],exactMatch:!1}}),this.props.onUpdate(filter)}},{key:"clearFilter",value:function(){this.queryString=QueryString.clear(this.props.Module),this.props.onUpdate({})}},{key:"getFormChildren",value:function(){var formChildren=[];return React.Children.forEach(this.props.children,function(child,key){if(React.isValidElement(child)&&"function"==typeof child.type&&child.props.onUserInput){var callbackFunc=child.props.onUserInput,callbackName=callbackFunc.name,elementName=child.type.displayName,queryFieldName="candID"===child.props.name?"candidateID":child.props.name,filterValue=this.queryString[queryFieldName];"onUserInput"===callbackName&&(callbackFunc="ButtonElement"===elementName&&"reset"===child.props.type?this.clearFilter:this.onElementUpdate.bind(null,elementName)),formChildren.push(React.cloneElement(child,{onUserInput:callbackFunc,value:filterValue?filterValue:"",key:key})),this.setFilter(elementName,child.props.name,filterValue)}else formChildren.push(React.cloneElement(child,{key:key}))}.bind(this)),formChildren}},{key:"setFilter",value:function(type,key,value){var filter={};return this.props.filter&&(filter=JSON.parse(JSON.stringify(this.props.filter))),key&&value?(filter[key]={},filter[key].value=value,filter[key].exactMatch="SelectElement"===type):filter&&key&&""===value&&delete filter[key],filter}},{key:"onElementUpdate",value:function(type,fieldName,fieldValue){if("string"==typeof fieldName&&"string"==typeof fieldValue){var queryFieldName="candID"===fieldName?"candidateID":fieldName;this.queryString=QueryString.set(this.queryString,queryFieldName,fieldValue);var filter=this.setFilter(type,fieldName,fieldValue);this.props.onUpdate(filter)}}},{key:"render",value:function(){var formChildren=this.getFormChildren(),formElements=this.props.formElements;return formElements&&Object.keys(formElements).forEach(function(fieldName){var queryFieldName="candID"===fieldName?"candidateID":fieldName;formElements[fieldName].onUserInput=this.onElementUpdate.bind(null,fieldName),formElements[fieldName].value=this.queryString[queryFieldName]}.bind(this)),React.createElement(_Panel2.default,{id:this.props.id,height:this.props.height,title:this.props.title},React.createElement(FormElement,this.props,formChildren))}}]),FilterForm}(React.Component);FilterForm.defaultProps={id:"selection-filter",height:"100%",title:"Selection Filter",onUpdate:function(){console.warn("onUpdate() callback is not set!")}},FilterForm.propTypes={Module:React.PropTypes.string.isRequired,filter:React.PropTypes.object.isRequired,id:React.PropTypes.string,height:React.PropTypes.string,title:React.PropTypes.string,onUpdate:React.PropTypes.func},exports.default=FilterForm},,function(module,exports,__webpack_require__){"use strict";function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}Object.defineProperty(exports,"__esModule",{value:!0});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),_FilterForm=__webpack_require__(13),_FilterForm2=_interopRequireDefault(_FilterForm),_Tabs=__webpack_require__(9),_LogPanel=__webpack_require__(16),_LogPanel2=_interopRequireDefault(_LogPanel),_UploadForm=__webpack_require__(17),_UploadForm2=_interopRequireDefault(_UploadForm),_columnFormatter=__webpack_require__(19),_columnFormatter2=_interopRequireDefault(_columnFormatter),ImagingUploader=function(_React$Component){function ImagingUploader(props){_classCallCheck(this,ImagingUploader);var _this=_possibleConstructorReturn(this,(ImagingUploader.__proto__||Object.getPrototypeOf(ImagingUploader)).call(this,props));return _this.state={isLoaded:!1,filter:{}},_this.fetchData=_this.fetchData.bind(_this),_this.updateFilter=_this.updateFilter.bind(_this),_this}return _inherits(ImagingUploader,_React$Component),_createClass(ImagingUploader,[{key:"componentDidMount",value:function(){this.fetchData()}},{key:"fetchData",value:function(){$.ajax(this.props.DataURL,{method:"GET",dataType:"json",success:function(data){this.setState({Data:data,isLoaded:!0})}.bind(this),error:function(_error){console.error(_error)}})}},{key:"updateFilter",value:function(filter){this.setState({filter:filter})}},{key:"render",value:function(){if(!this.state.isLoaded)return React.createElement("button",{className:"btn-info has-spinner"},"Loading",React.createElement("span",{className:"glyphicon glyphicon-refresh glyphicon-refresh-animate"}));var tabList=[{id:"browse",label:"Browse"},{id:"upload",label:"Upload"}];return React.createElement(_Tabs.Tabs,{tabs:tabList,defaultTab:"browse",updateURL:!0},React.createElement(_Tabs.TabPane,{TabId:tabList[0].id},React.createElement("div",{className:"row"},React.createElement("div",{className:"col-md-5"},React.createElement(_FilterForm2.default,{Module:"imaging_uploader",name:"imaging_filter",id:"imaging_filter",onUpdate:this.updateFilter,filter:this.state.filter},React.createElement(TextboxElement,this.state.Data.form.candID),React.createElement(TextboxElement,this.state.Data.form.pSCID),React.createElement(SelectElement,this.state.Data.form.visitLabel),React.createElement(ButtonElement,{type:"reset",label:"Clear Filters"}))),React.createElement("div",{className:"col-md-7"},React.createElement(_LogPanel2.default,null))),React.createElement("div",{id:"mri_upload_table"},React.createElement(StaticDataTable,{Data:this.state.Data.Data,Headers:this.state.Data.Headers,getFormattedCell:_columnFormatter2.default,Filter:this.state.filter}))),React.createElement(_Tabs.TabPane,{TabId:tabList[1].id},React.createElement(_UploadForm2.default,{form:this.state.Data.form,mriList:this.state.Data.mriList,maxUploadSize:this.state.Data.maxUploadSize})))}}]),ImagingUploader}(React.Component);ImagingUploader.propTypes={},ImagingUploader.defaultProps={},exports.default=ImagingUploader},function(module,exports,__webpack_require__){"use strict";function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}Object.defineProperty(exports,"__esModule",{value:!0});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),_Panel=__webpack_require__(2),_Panel2=_interopRequireDefault(_Panel),LogPanel=function(_React$Component){function LogPanel(props){_classCallCheck(this,LogPanel);var _this=_possibleConstructorReturn(this,(LogPanel.__proto__||Object.getPrototypeOf(LogPanel)).call(this,props));return _this.state={logText:"<select a row in the table below to view the upload logs>",logType:"summary"},_this.initHelper=_this.initHelper.bind(_this),_this.onLogTypeChange=_this.onLogTypeChange.bind(_this),_this.setServerPolling=_this.setServerPolling.bind(_this),_this.monitorProgress=_this.monitorProgress.bind(_this),_this}return _inherits(LogPanel,_React$Component),_createClass(LogPanel,[{key:"componentDidMount",value:function(){this.initHelper()}},{key:"initHelper",value:function(){var uploadProgress=new UploadProgress;this.uploadProgress=uploadProgress,$("#mri_upload_table").on("click","tbody tr",function(event){return null!==uploadProgress.getUploadRow()&&($(uploadProgress.getUploadRow()).css("background-color","white"),this.setServerPolling(!1)),event.currentTarget===uploadProgress.getUploadRow()?(uploadProgress.setUploadRow(null),uploadProgress.setProgressFromServer(null),void this.setState({logText:"<select a row in the table below to view the upload logs>"})):(uploadProgress.setUploadRow(event.currentTarget),$(event.currentTarget).css("background-color","#EFEFFB"),void this.monitorProgress(this.state.logType))}.bind(this))}},{key:"monitorProgress",value:function(logType){var summary="summary"===logType,uploadProgress=this.uploadProgress,uploadId=uploadProgress.getUploadId();uploadId&&$.post(loris.BaseURL+"/imaging_uploader/ajax/getUploadSummary.php",{uploadId:uploadId,summary:summary},function(data){uploadProgress.setProgressFromServer(data),this.setState({logText:uploadProgress.getProgressText()}),this.setServerPolling(uploadProgress.getPipelineStatus()===UploadProgress.PIPELINE_STATUS_RUNNING)}.bind(this))}},{key:"setServerPolling",value:function(poll){var uploadProgress=this.uploadProgress;poll?(this.setServerPolling.getSummaryInterval||(this.setServerPolling.getSummaryInterval=setInterval(this.monitorProgress,5e3)),this.setServerPolling.dotUpdateInterval||(this.setServerPolling.dotUpdateInterval=setInterval(function(){uploadProgress.updateDots(),this.setState({logText:uploadProgress.getProgressText()})},3e3)),this.setServerPolling.animatedCharInterval||(this.setServerPolling.animatedCharInterval=setInterval(function(){uploadProgress.updateAnimatedCharIndex(),this.setState({logText:uploadProgress.getProgressText()})},250))):(this.setServerPolling.getSummaryInterval&&(clearInterval(this.setServerPolling.getSummaryInterval),this.setServerPolling.getSummaryInterval=null),this.setServerPolling.dotUpdateInterval&&(clearInterval(this.setServerPolling.dotUpdateInterval),this.setServerPolling.dotUpdateInterval=null),this.setServerPolling.animatedCharInterval&&(clearInterval(this.setServerPolling.animatedCharInterval),this.setServerPolling.animatedCharInterval=null))}},{key:"onLogTypeChange",value:function(name,value){this.monitorProgress(value),this.setState({logType:value})}},{key:"render",value:function(){var logTypes={summary:"Summary",detailed:"Detailed"};return React.createElement(_Panel2.default,{id:"log_panel",title:"Log Viewer"},React.createElement(FormElement,{name:"log_form"},React.createElement(SelectElement,{name:"LogType",label:"Logs to display",options:logTypes,onUserInput:this.onLogTypeChange,value:this.state.logType,emptyOption:!1}),React.createElement(TextareaElement,{name:"UploadLogs",disabled:!0,id:"mri_upload_logs",value:this.state.logText,rows:6})))}}]),LogPanel}(React.Component);LogPanel.propTypes={},LogPanel.defaultProps={},exports.default=LogPanel},function(module,exports,__webpack_require__){"use strict";function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}Object.defineProperty(exports,"__esModule",{value:!0});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),_ProgressBar=__webpack_require__(18),_ProgressBar2=_interopRequireDefault(_ProgressBar),UploadForm=function(_React$Component){function UploadForm(props){_classCallCheck(this,UploadForm);var _this=_possibleConstructorReturn(this,(UploadForm.__proto__||Object.getPrototypeOf(UploadForm)).call(this,props)),form=JSON.parse(JSON.stringify(_this.props.form));return form.IsPhantom.required=!0,form.candID.required=!0,form.pSCID.required=!0,form.visitLabel.required=!0,form.mri_file.required=!0,_this.state={formData:{},form:form,uploadProgress:-1},_this.onFormChange=_this.onFormChange.bind(_this),_this.submitForm=_this.submitForm.bind(_this),_this.uploadFile=_this.uploadFile.bind(_this),_this}return _inherits(UploadForm,_React$Component),_createClass(UploadForm,[{key:"componentDidMount",value:function(){this.onFormChange(this.state.form.IsPhantom.name,null)}},{key:"onFormChange",value:function(field,value){if(field){var form=JSON.parse(JSON.stringify(this.state.form)),formData=Object.assign({},this.state.formData);"IsPhantom"===field&&("N"===value?(form.candID.disabled=!1,form.pSCID.disabled=!1,form.visitLabel.disabled=!1):(form.candID.disabled=!0,form.pSCID.disabled=!0,form.visitLabel.disabled=!0,delete formData.candID,delete formData.pSCID,delete formData.visitLabel)),formData[field]=value,this.setState({form:form,formData:formData})}}},{key:"submitForm",value:function(){var data=this.state.formData;if(data.mri_file&&data.IsPhantom&&("N"!==data.IsPhantom||data.candID&&data.pSCID&&data.visitLabel)){var fileName=data.mri_file.name,mriFile=this.props.mriList.find(function(mriFile){return mriFile.fileName.indexOf(fileName)>-1});if(!mriFile)return void this.uploadFile();if("Success"===mriFile.status)return void swal({title:"File already exists!",text:"A file with this name has already successfully passed the MRI pipeline!\n",type:"error",confirmButtonText:"OK"});if("In Progress..."===mriFile.status)return void swal({title:"File is currently processing!",text:"A file with this name is currently going through the MRI pipeline!\n",type:"error",confirmButtonText:"OK"});"Failure"===mriFile.status&&swal({title:"Are you sure?",text:"A file with this name already exists!\n Would you like to override existing file?",type:"warning",showCancelButton:!0,confirmButtonText:"Yes, I am sure!",cancelButtonText:"No, cancel it!"},function(isConfirm){isConfirm?this.uploadFile(!0):swal("Cancelled","Your imaginary file is safe :)","error")}.bind(this)),"Not Started"===mriFile.status&&swal({title:"Are you sure?",text:"A file with this name has been uploaded but has not yet started the MRI pipeline.\n Would you like to override the existing file?",type:"warning",showCancelButton:!0,confirmButtonText:"Yes, I am sure!",cancelButtonText:"No, cancel it!"},function(isConfirm){isConfirm?this.uploadFile(!0):swal("Cancelled","Your upload has been cancelled.","error")}.bind(this))}}},{key:"uploadFile",value:function(overwriteFile){var formData=this.state.formData,formObj=new FormData;for(var key in formData)""!==formData[key]&&formObj.append(key,formData[key]);formObj.append("fire_away","Upload"),overwriteFile&&formObj.append("overwrite",!0),$.ajax({type:"POST",url:loris.BaseURL+"/imaging_uploader/",data:formObj,cache:!1,contentType:!1,processData:!1,xhr:function(){var xhr=new window.XMLHttpRequest;return xhr.upload.addEventListener("progress",function(evt){if(evt.lengthComputable){var percentage=Math.round(evt.loaded/evt.total*100);this.setState({uploadProgress:percentage})}}.bind(this),!1),xhr}.bind(this),success:function(data){swal({title:"Upload Successful!",type:"success"},function(){window.location.assign(loris.BaseURL+"/imaging_uploader/")})},error:function(err){var errMessage="The following errors occured while attempting to display this page:",responseText=err.responseText;responseText.indexOf(errMessage)>-1&&(responseText=responseText.replace("history.back()","location.reload()"),document.open(),document.write(responseText),document.close()),console.error(err)}.bind(this)})}},{key:"render",value:function(){var form=this.state.form;form.IsPhantom.value=this.state.formData.IsPhantom,form.candID.value=this.state.formData.candID,form.pSCID.value=this.state.formData.pSCID,form.visitLabel.value=this.state.formData.visitLabel,form.mri_file.value=this.state.formData.mri_file;var btnClass=this.state.uploadProgress>-1?"btn btn-primary hide":void 0,notes="File name must be of type .tgz or tar.gz or .zip. Uploads cannot exceed "+this.props.maxUploadSize;return React.createElement("div",{className:"row"},React.createElement("div",{className:"col-md-7"},React.createElement("h3",null,"Upload an imaging scan"),React.createElement("br",null),React.createElement(FormElement,{name:"upload_form",formElements:form,fileUpload:!0,onUserInput:this.onFormChange},React.createElement(StaticElement,{label:"Notes",text:notes}),React.createElement("div",{className:"row"},React.createElement("div",{className:"col-sm-9 col-sm-offset-3"},React.createElement(_ProgressBar2.default,{value:this.state.uploadProgress}))),React.createElement(ButtonElement,{onUserInput:this.submitForm,buttonClass:btnClass}))))}}]),UploadForm}(React.Component);UploadForm.propTypes={},UploadForm.defaultProps={},exports.default=UploadForm},function(module,exports){"use strict";function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}Object.defineProperty(exports,"__esModule",{value:!0});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),ProgressBar=function(_React$Component){function ProgressBar(){return _classCallCheck(this,ProgressBar),_possibleConstructorReturn(this,(ProgressBar.__proto__||Object.getPrototypeOf(ProgressBar)).apply(this,arguments))}return _inherits(ProgressBar,_React$Component),_createClass(ProgressBar,[{key:"render",value:function(){var progressStyle={display:this.props.value<0?"none":"block",backgroundColor:"#d3d3d3",height:"30px",position:"relative"},labelStyle={position:"absolute",top:0,left:0,zIndex:1e3,width:"100%",color:"#fff",textAlign:"center",lineHeight:"30px",fontWeight:"600"};return React.createElement("div",{className:"progress",style:progressStyle},React.createElement("div",{className:"progress-bar progress-bar-striped active",role:"progressbar","aria-valuemin":"0","aria-valuemax":"100","aria-valuenow":this.props.value,style:{width:this.props.value+"%"}}),React.createElement("span",{style:labelStyle},this.props.value,"%"))}}]),ProgressBar}(React.Component);ProgressBar.propTypes={value:React.PropTypes.number},ProgressBar.defaultProps={value:0},exports.default=ProgressBar},function(module,exports){"use strict";function formatColumn(column,cell,rowData,rowHeaders){function handleClick(dccid,e){loris.loadFilteredMenuClickHandler("imaging_browser/",{DCCID:dccid
-})(e)}function openViolatedScans(patientName,e){loris.loadFilteredMenuClickHandler("mri_violations/",{PatientName:patientName})(e)}if(loris.hiddenHeaders.indexOf(column)>-1)return null;var row={};rowHeaders.forEach(function(header,index){row[header]=rowData[index]},this);var cellStyle={whiteSpace:"nowrap"};if("Progress"===column){if("Failure"===cell)return cellStyle.color="#fff",React.createElement("td",{className:"label-danger",style:cellStyle},cell);if("In Progress..."===cell)return cellStyle.color="#fff",React.createElement("td",{className:"label-warning",style:cellStyle},cell);var created=row["Number Of MincCreated"],inserted=row["Number Of MincInserted"];return React.createElement("td",{style:cellStyle},cell," (",inserted," out of ",created,")")}if("Tarchive Info"===column){if(!cell||"0"===cell)return React.createElement("td",null);var url=loris.BaseURL+"/dicom_archive/viewDetails/?tarchiveID="+cell;return React.createElement("td",{style:cellStyle},React.createElement("a",{href:url},"View Details"))}if("Number Of MincInserted"===column&&cell>0)return React.createElement("td",{style:cellStyle},React.createElement("a",{onClick:handleClick.bind(null,row.CandID)},cell));if("Number Of MincCreated"===column){var violatedScans=void 0;if(row["Number Of MincCreated"]-row["Number Of MincInserted"]>0){var numViolatedScans=row["Number Of MincCreated"]-row["Number Of MincInserted"],patientName=row.PatientName;violatedScans=React.createElement("a",{onClick:openViolatedScans.bind(null,patientName)},"(",numViolatedScans," violated scans)")}return React.createElement("td",{style:cellStyle},cell," ",violatedScans)}return React.createElement("td",{style:cellStyle},cell)}Object.defineProperty(exports,"__esModule",{value:!0}),loris.hiddenHeaders=["PatientName"],exports.default=formatColumn}]);
+!function(modules){function __webpack_require__(moduleId){if(installedModules[moduleId])return installedModules[moduleId].exports;var module=installedModules[moduleId]={exports:{},id:moduleId,loaded:!1};return modules[moduleId].call(module.exports,module,module.exports,__webpack_require__),module.loaded=!0,module.exports}var installedModules={};return __webpack_require__.m=modules,__webpack_require__.c=installedModules,__webpack_require__.p="",__webpack_require__(0)}([function(module,exports,__webpack_require__){"use strict";function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}var _ImagingUploader=__webpack_require__(15),_ImagingUploader2=_interopRequireDefault(_ImagingUploader);$(function(){var imagingUploader=React.createElement("div",{className:"page-imaging-uploader"},React.createElement(_ImagingUploader2.default,{Module:"imaging_uploader",DataURL:loris.BaseURL+"/imaging_uploader/?format=json"}));ReactDOM.render(imagingUploader,document.getElementById("lorisworkspace"))})},,function(module,exports){"use strict";function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}Object.defineProperty(exports,"__esModule",{value:!0});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),Panel=function(_React$Component){function Panel(props){_classCallCheck(this,Panel);var _this=_possibleConstructorReturn(this,(Panel.__proto__||Object.getPrototypeOf(Panel)).call(this,props));return _this.state={collapsed:_this.props.initCollapsed},_this.panelClass=_this.props.initCollapsed?"panel-collapse collapse":"panel-collapse collapse in",_this.toggleCollapsed=_this.toggleCollapsed.bind(_this),_this}return _inherits(Panel,_React$Component),_createClass(Panel,[{key:"toggleCollapsed",value:function(){this.setState({collapsed:!this.state.collapsed})}},{key:"render",value:function(){var glyphClass=this.state.collapsed?"glyphicon pull-right glyphicon-chevron-down":"glyphicon pull-right glyphicon-chevron-up",panelHeading=this.props.title?React.createElement("div",{className:"panel-heading",onClick:this.toggleCollapsed,"data-toggle":"collapse","data-target":"#"+this.props.id,style:{cursor:"pointer"}},this.props.title,React.createElement("span",{className:glyphClass})):"";return React.createElement("div",{className:"panel panel-primary"},panelHeading,React.createElement("div",{id:this.props.id,className:this.panelClass,role:"tabpanel"},React.createElement("div",{className:"panel-body",style:{height:this.props.height}},this.props.children)))}}]),Panel}(React.Component);Panel.propTypes={id:React.PropTypes.string,height:React.PropTypes.string,title:React.PropTypes.string},Panel.defaultProps={initCollapsed:!1,id:"default-panel",height:"100%"},exports.default=Panel},,,,,,,function(module,exports){"use strict";function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}Object.defineProperty(exports,"__esModule",{value:!0});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),Tabs=function(_React$Component){function Tabs(props){_classCallCheck(this,Tabs);var _this=_possibleConstructorReturn(this,(Tabs.__proto__||Object.getPrototypeOf(Tabs)).call(this,props)),hash=window.location.hash,activeTab="";return _this.props.updateURL&&hash?activeTab=hash.substr(1):_this.props.defaultTab?activeTab=_this.props.defaultTab:_this.props.tabs.length>0&&(activeTab=_this.props.tabs[0].id),_this.state={activeTab:activeTab},_this.handleClick=_this.handleClick.bind(_this),_this.getTabs=_this.getTabs.bind(_this),_this.getTabPanes=_this.getTabPanes.bind(_this),_this}return _inherits(Tabs,_React$Component),_createClass(Tabs,[{key:"handleClick",value:function(tabId,e){if(this.setState({activeTab:tabId}),this.props.onTabChange(tabId),this.props.updateURL){var scrollDistance=$("body").scrollTop()||$("html").scrollTop();window.location.hash=e.target.hash,$("html,body").scrollTop(scrollDistance)}}},{key:"getTabs",value:function(){var tabs=this.props.tabs.map(function(tab){var tabClass=this.state.activeTab===tab.id?"active":null,href="#"+tab.id,tabID="tab-"+tab.id;return React.createElement("li",{role:"presentation",className:tabClass,key:tab.id},React.createElement("a",{id:tabID,href:href,role:"tab","data-toggle":"tab",onClick:this.handleClick.bind(null,tab.id)},tab.label))}.bind(this));return tabs}},{key:"getTabPanes",value:function(){var tabPanes=React.Children.map(this.props.children,function(child,key){if(child)return React.cloneElement(child,{activeTab:this.state.activeTab,key:key})}.bind(this));return tabPanes}},{key:"render",value:function(){var tabs=this.getTabs(),tabPanes=this.getTabPanes(),tabStyle={marginLeft:0,marginBottom:"5px"};return React.createElement("div",null,React.createElement("ul",{className:"nav nav-tabs",role:"tablist",style:tabStyle},tabs),React.createElement("div",{className:"tab-content"},tabPanes))}}]),Tabs}(React.Component);Tabs.propTypes={tabs:React.PropTypes.array.isRequired,defaultTab:React.PropTypes.string,updateURL:React.PropTypes.bool},Tabs.defaultProps={onTabChange:function(){},updateURL:!0};var VerticalTabs=function(_React$Component2){function VerticalTabs(props){_classCallCheck(this,VerticalTabs);var _this2=_possibleConstructorReturn(this,(VerticalTabs.__proto__||Object.getPrototypeOf(VerticalTabs)).call(this,props)),hash=window.location.hash,activeTab="";return _this2.props.updateURL&&hash?activeTab=hash.substr(1):_this2.props.defaultTab?activeTab=_this2.props.defaultTab:_this2.props.tabs.length>0&&(activeTab=_this2.props.tabs[0].id),_this2.state={activeTab:activeTab},_this2.handleClick=_this2.handleClick.bind(_this2),_this2.getTabs=_this2.getTabs.bind(_this2),_this2.getTabPanes=_this2.getTabPanes.bind(_this2),_this2}return _inherits(VerticalTabs,_React$Component2),_createClass(VerticalTabs,[{key:"handleClick",value:function(tabId,e){if(this.setState({activeTab:tabId}),this.props.onTabChange(tabId),this.props.updateURL){var scrollDistance=$("body").scrollTop()||$("html").scrollTop();window.location.hash=e.target.hash,$("html,body").scrollTop(scrollDistance)}}},{key:"getTabs",value:function(){var tabs=this.props.tabs.map(function(tab){var tabClass=this.state.activeTab===tab.id?"active":null,href="#"+tab.id,tabID="tab-"+tab.id;return React.createElement("li",{role:"presentation",className:tabClass,key:tab.id},React.createElement("a",{id:tabID,href:href,role:"tab","data-toggle":"tab",onClick:this.handleClick.bind(null,tab.id)},tab.label))}.bind(this));return tabs}},{key:"getTabPanes",value:function(){var tabPanes=React.Children.map(this.props.children,function(child,key){if(child)return React.cloneElement(child,{activeTab:this.state.activeTab,key:key})}.bind(this));return tabPanes}},{key:"render",value:function(){var tabs=this.getTabs(),tabPanes=this.getTabPanes(),tabStyle={marginLeft:0,marginBottom:"5px"};return React.createElement("div",null,React.createElement("div",{className:"tabbable col-md-3 col-sm-3"},React.createElement("ul",{className:"nav nav-pills nav-stacked",role:"tablist",style:tabStyle},tabs)),React.createElement("div",{className:"tab-content col-md-9 col-sm-9"},tabPanes))}}]),VerticalTabs}(React.Component);VerticalTabs.propTypes={tabs:React.PropTypes.array.isRequired,defaultTab:React.PropTypes.string,updateURL:React.PropTypes.bool},VerticalTabs.defaultProps={onTabChange:function(){},updateURL:!0};var TabPane=function(_React$Component3){function TabPane(){return _classCallCheck(this,TabPane),_possibleConstructorReturn(this,(TabPane.__proto__||Object.getPrototypeOf(TabPane)).apply(this,arguments))}return _inherits(TabPane,_React$Component3),_createClass(TabPane,[{key:"render",value:function(){var classList="tab-pane",title=void 0;return this.props.TabId===this.props.activeTab&&(classList+=" active"),this.props.Title&&(title=React.createElement("h1",null,this.props.Title)),React.createElement("div",{role:"tabpanel",className:classList,id:this.props.TabId},title,this.props.children)}}]),TabPane}(React.Component);TabPane.propTypes={TabId:React.PropTypes.string.isRequired,Title:React.PropTypes.string,activeTab:React.PropTypes.string},exports.Tabs=Tabs,exports.VerticalTabs=VerticalTabs,exports.TabPane=TabPane},,,,function(module,exports,__webpack_require__){"use strict";function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}Object.defineProperty(exports,"__esModule",{value:!0});var _typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(obj){return typeof obj}:function(obj){return obj&&"function"==typeof Symbol&&obj.constructor===Symbol&&obj!==Symbol.prototype?"symbol":typeof obj},_createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),_Panel=__webpack_require__(2),_Panel2=_interopRequireDefault(_Panel),FilterForm=function(_React$Component){function FilterForm(props){_classCallCheck(this,FilterForm);var _this=_possibleConstructorReturn(this,(FilterForm.__proto__||Object.getPrototypeOf(FilterForm)).call(this,props));return _this.clearFilter=_this.clearFilter.bind(_this),_this.getFormChildren=_this.getFormChildren.bind(_this),_this.setFilter=_this.setFilter.bind(_this),_this.onElementUpdate=_this.onElementUpdate.bind(_this),_this.queryString=QueryString.get(),_this}return _inherits(FilterForm,_React$Component),_createClass(FilterForm,[{key:"componentDidMount",value:function(){var filter={},queryString=this.queryString;Object.keys(queryString).forEach(function(key){var filterKey="candidateID"===key?"candID":key;filter[filterKey]={value:queryString[key],exactMatch:!1}}),this.props.onUpdate(filter)}},{key:"clearFilter",value:function(){this.queryString=QueryString.clear(this.props.Module),this.props.onUpdate({})}},{key:"getFormChildren",value:function(){var formChildren=[];return React.Children.forEach(this.props.children,function(child,key){if(React.isValidElement(child)&&"function"==typeof child.type&&child.props.onUserInput){var callbackFunc=child.props.onUserInput,callbackName=callbackFunc.name,elementName=child.type.displayName,queryFieldName="candID"===child.props.name?"candidateID":child.props.name,filterValue=this.queryString[queryFieldName];"onUserInput"===callbackName&&(callbackFunc="ButtonElement"===elementName&&"reset"===child.props.type?this.clearFilter:this.onElementUpdate.bind(null,elementName)),formChildren.push(React.cloneElement(child,{onUserInput:callbackFunc,value:filterValue?filterValue:"",key:key})),this.setFilter(elementName,child.props.name,filterValue)}else formChildren.push(React.cloneElement(child,{key:key}))}.bind(this)),formChildren}},{key:"setFilter",value:function(type,key,value){var filter={};return this.props.filter&&(filter=JSON.parse(JSON.stringify(this.props.filter))),key?(filter[key]={},0===value.length?filter[key].value="":key&&value&&(filter[key].value=value),filter[key].exactMatch="SelectElement"===type):filter&&key&&""===value&&delete filter[key],filter}},{key:"onElementUpdate",value:function(type,fieldName,fieldValue){if("string"==typeof fieldName&&("string"==typeof fieldValue||"object"===("undefined"==typeof fieldValue?"undefined":_typeof(fieldValue)))){var queryFieldName="candID"===fieldName?"candidateID":fieldName;this.queryString=QueryString.set(this.queryString,queryFieldName,fieldValue);var filter=this.setFilter(type,fieldName,fieldValue);this.props.onUpdate(filter)}}},{key:"render",value:function(){var formChildren=this.getFormChildren(),formElements=this.props.formElements;return formElements&&Object.keys(formElements).forEach(function(fieldName){var queryFieldName="candID"===fieldName?"candidateID":fieldName;formElements[fieldName].onUserInput=this.onElementUpdate.bind(null,fieldName),formElements[fieldName].value=this.queryString[queryFieldName]}.bind(this)),React.createElement(_Panel2.default,{id:this.props.id,height:this.props.height,title:this.props.title},React.createElement(FormElement,this.props,formChildren))}}]),FilterForm}(React.Component);FilterForm.defaultProps={id:"selection-filter",height:"100%",title:"Selection Filter",onUpdate:function(){console.warn("onUpdate() callback is not set!")}},FilterForm.propTypes={Module:React.PropTypes.string.isRequired,filter:React.PropTypes.object.isRequired,id:React.PropTypes.string,height:React.PropTypes.string,title:React.PropTypes.string,onUpdate:React.PropTypes.func},exports.default=FilterForm},,function(module,exports,__webpack_require__){"use strict";function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}Object.defineProperty(exports,"__esModule",{value:!0});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),_FilterForm=__webpack_require__(13),_FilterForm2=_interopRequireDefault(_FilterForm),_Tabs=__webpack_require__(9),_LogPanel=__webpack_require__(16),_LogPanel2=_interopRequireDefault(_LogPanel),_UploadForm=__webpack_require__(17),_UploadForm2=_interopRequireDefault(_UploadForm),_columnFormatter=__webpack_require__(19),_columnFormatter2=_interopRequireDefault(_columnFormatter),ImagingUploader=function(_React$Component){function ImagingUploader(props){_classCallCheck(this,ImagingUploader);var _this=_possibleConstructorReturn(this,(ImagingUploader.__proto__||Object.getPrototypeOf(ImagingUploader)).call(this,props));return _this.state={isLoaded:!1,filter:{}},_this.fetchData=_this.fetchData.bind(_this),_this.updateFilter=_this.updateFilter.bind(_this),_this}return _inherits(ImagingUploader,_React$Component),_createClass(ImagingUploader,[{key:"componentDidMount",value:function(){this.fetchData()}},{key:"fetchData",value:function(){$.ajax(this.props.DataURL,{method:"GET",dataType:"json",success:function(data){this.setState({Data:data,isLoaded:!0})}.bind(this),error:function(_error){console.error(_error)}})}},{key:"updateFilter",value:function(filter){this.setState({filter:filter})}},{key:"render",value:function(){if(!this.state.isLoaded)return React.createElement("button",{className:"btn-info has-spinner"},"Loading",React.createElement("span",{className:"glyphicon glyphicon-refresh glyphicon-refresh-animate"}));var tabList=[{id:"browse",label:"Browse"},{id:"upload",label:"Upload"}];return React.createElement(_Tabs.Tabs,{tabs:tabList,defaultTab:"browse",updateURL:!0},React.createElement(_Tabs.TabPane,{TabId:tabList[0].id},React.createElement("div",{className:"row"},React.createElement("div",{className:"col-md-5"},React.createElement(_FilterForm2.default,{Module:"imaging_uploader",name:"imaging_filter",id:"imaging_filter",onUpdate:this.updateFilter,filter:this.state.filter},React.createElement(TextboxElement,this.state.Data.form.candID),React.createElement(TextboxElement,this.state.Data.form.pSCID),React.createElement(SelectElement,this.state.Data.form.visitLabel),React.createElement(ButtonElement,{type:"reset",label:"Clear Filters"}))),React.createElement("div",{className:"col-md-7"},React.createElement(_LogPanel2.default,null))),React.createElement("div",{id:"mri_upload_table"},React.createElement(StaticDataTable,{Data:this.state.Data.Data,Headers:this.state.Data.Headers,getFormattedCell:_columnFormatter2.default,Filter:this.state.filter}))),React.createElement(_Tabs.TabPane,{TabId:tabList[1].id},React.createElement(_UploadForm2.default,{form:this.state.Data.form,mriList:this.state.Data.mriList,maxUploadSize:this.state.Data.maxUploadSize})))}}]),ImagingUploader}(React.Component);ImagingUploader.propTypes={},ImagingUploader.defaultProps={},exports.default=ImagingUploader},function(module,exports,__webpack_require__){"use strict";function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}Object.defineProperty(exports,"__esModule",{value:!0});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),_Panel=__webpack_require__(2),_Panel2=_interopRequireDefault(_Panel),LogPanel=function(_React$Component){function LogPanel(props){_classCallCheck(this,LogPanel);var _this=_possibleConstructorReturn(this,(LogPanel.__proto__||Object.getPrototypeOf(LogPanel)).call(this,props));return _this.state={logText:"<select a row in the table below to view the upload logs>",logType:"summary"},_this.initHelper=_this.initHelper.bind(_this),_this.onLogTypeChange=_this.onLogTypeChange.bind(_this),_this.setServerPolling=_this.setServerPolling.bind(_this),_this.monitorProgress=_this.monitorProgress.bind(_this),_this}return _inherits(LogPanel,_React$Component),_createClass(LogPanel,[{key:"componentDidMount",value:function(){this.initHelper()}},{key:"initHelper",value:function(){var uploadProgress=new UploadProgress;this.uploadProgress=uploadProgress,$("#mri_upload_table").on("click","tbody tr",function(event){return null!==uploadProgress.getUploadRow()&&($(uploadProgress.getUploadRow()).css("background-color","white"),this.setServerPolling(!1)),event.currentTarget===uploadProgress.getUploadRow()?(uploadProgress.setUploadRow(null),uploadProgress.setProgressFromServer(null),void this.setState({logText:"<select a row in the table below to view the upload logs>"})):(uploadProgress.setUploadRow(event.currentTarget),$(event.currentTarget).css("background-color","#EFEFFB"),void this.monitorProgress(this.state.logType))}.bind(this))}},{key:"monitorProgress",value:function(logType){var summary="summary"===logType,uploadProgress=this.uploadProgress,uploadId=uploadProgress.getUploadId();uploadId&&$.post(loris.BaseURL+"/imaging_uploader/ajax/getUploadSummary.php",{uploadId:uploadId,summary:summary},function(data){uploadProgress.setProgressFromServer(data),this.setState({logText:uploadProgress.getProgressText()}),this.setServerPolling(uploadProgress.getPipelineStatus()===UploadProgress.PIPELINE_STATUS_RUNNING)}.bind(this))}},{key:"setServerPolling",value:function(poll){var uploadProgress=this.uploadProgress;poll?(this.setServerPolling.getSummaryInterval||(this.setServerPolling.getSummaryInterval=setInterval(this.monitorProgress,5e3)),this.setServerPolling.dotUpdateInterval||(this.setServerPolling.dotUpdateInterval=setInterval(function(){uploadProgress.updateDots(),this.setState({logText:uploadProgress.getProgressText()})},3e3)),this.setServerPolling.animatedCharInterval||(this.setServerPolling.animatedCharInterval=setInterval(function(){uploadProgress.updateAnimatedCharIndex(),this.setState({logText:uploadProgress.getProgressText()})},250))):(this.setServerPolling.getSummaryInterval&&(clearInterval(this.setServerPolling.getSummaryInterval),this.setServerPolling.getSummaryInterval=null),this.setServerPolling.dotUpdateInterval&&(clearInterval(this.setServerPolling.dotUpdateInterval),this.setServerPolling.dotUpdateInterval=null),this.setServerPolling.animatedCharInterval&&(clearInterval(this.setServerPolling.animatedCharInterval),this.setServerPolling.animatedCharInterval=null))}},{key:"onLogTypeChange",value:function(name,value){this.monitorProgress(value),this.setState({logType:value})}},{key:"render",value:function(){var logTypes={summary:"Summary",detailed:"Detailed"};return React.createElement(_Panel2.default,{id:"log_panel",title:"Log Viewer"},React.createElement(FormElement,{name:"log_form"},React.createElement(SelectElement,{name:"LogType",label:"Logs to display",options:logTypes,onUserInput:this.onLogTypeChange,value:this.state.logType,emptyOption:!1}),React.createElement(TextareaElement,{name:"UploadLogs",disabled:!0,id:"mri_upload_logs",value:this.state.logText,rows:6})))}}]),LogPanel}(React.Component);LogPanel.propTypes={},LogPanel.defaultProps={},exports.default=LogPanel},function(module,exports,__webpack_require__){"use strict";function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}Object.defineProperty(exports,"__esModule",{value:!0});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),_ProgressBar=__webpack_require__(18),_ProgressBar2=_interopRequireDefault(_ProgressBar),UploadForm=function(_React$Component){function UploadForm(props){_classCallCheck(this,UploadForm);var _this=_possibleConstructorReturn(this,(UploadForm.__proto__||Object.getPrototypeOf(UploadForm)).call(this,props)),form=JSON.parse(JSON.stringify(_this.props.form));return form.IsPhantom.required=!0,form.candID.required=!0,form.pSCID.required=!0,form.visitLabel.required=!0,form.mri_file.required=!0,_this.state={formData:{},form:form,uploadProgress:-1},_this.onFormChange=_this.onFormChange.bind(_this),_this.submitForm=_this.submitForm.bind(_this),_this.uploadFile=_this.uploadFile.bind(_this),_this}return _inherits(UploadForm,_React$Component),_createClass(UploadForm,[{key:"componentDidMount",value:function(){this.onFormChange(this.state.form.IsPhantom.name,null)}},{key:"onFormChange",value:function(field,value){if(field){var form=JSON.parse(JSON.stringify(this.state.form)),formData=Object.assign({},this.state.formData);"IsPhantom"===field&&("N"===value?(form.candID.disabled=!1,form.pSCID.disabled=!1,form.visitLabel.disabled=!1):(form.candID.disabled=!0,form.pSCID.disabled=!0,form.visitLabel.disabled=!0,delete formData.candID,delete formData.pSCID,delete formData.visitLabel)),formData[field]=value,this.setState({form:form,formData:formData})}}},{key:"submitForm",value:function(){var data=this.state.formData;if(data.mri_file&&data.IsPhantom&&("N"!==data.IsPhantom||data.candID&&data.pSCID&&data.visitLabel)){var fileName=data.mri_file.name,mriFile=this.props.mriList.find(function(mriFile){return mriFile.fileName.indexOf(fileName)>-1});if(!mriFile)return void this.uploadFile();if("Success"===mriFile.status)return void swal({title:"File already exists!",text:"A file with this name has already successfully passed the MRI pipeline!\n",type:"error",confirmButtonText:"OK"});if("In Progress..."===mriFile.status)return void swal({title:"File is currently processing!",text:"A file with this name is currently going through the MRI pipeline!\n",type:"error",confirmButtonText:"OK"});"Failure"===mriFile.status&&swal({title:"Are you sure?",text:"A file with this name already exists!\n Would you like to override existing file?",type:"warning",showCancelButton:!0,confirmButtonText:"Yes, I am sure!",cancelButtonText:"No, cancel it!"},function(isConfirm){isConfirm?this.uploadFile(!0):swal("Cancelled","Your imaginary file is safe :)","error")}.bind(this)),"Not Started"===mriFile.status&&swal({title:"Are you sure?",text:"A file with this name has been uploaded but has not yet started the MRI pipeline.\n Would you like to override the existing file?",type:"warning",showCancelButton:!0,confirmButtonText:"Yes, I am sure!",cancelButtonText:"No, cancel it!"},function(isConfirm){isConfirm?this.uploadFile(!0):swal("Cancelled","Your upload has been cancelled.","error")}.bind(this))}}},{key:"uploadFile",value:function(overwriteFile){var formData=this.state.formData,formObj=new FormData;for(var key in formData)""!==formData[key]&&formObj.append(key,formData[key]);formObj.append("fire_away","Upload"),overwriteFile&&formObj.append("overwrite",!0),$.ajax({type:"POST",url:loris.BaseURL+"/imaging_uploader/",data:formObj,cache:!1,contentType:!1,processData:!1,xhr:function(){var xhr=new window.XMLHttpRequest;return xhr.upload.addEventListener("progress",function(evt){if(evt.lengthComputable){var percentage=Math.round(evt.loaded/evt.total*100);this.setState({uploadProgress:percentage})}}.bind(this),!1),xhr}.bind(this),success:function(data){swal({title:"Upload Successful!",type:"success"},function(){window.location.assign(loris.BaseURL+"/imaging_uploader/")})},error:function(err){var errMessage="The following errors occured while attempting to display this page:",responseText=err.responseText;responseText.indexOf(errMessage)>-1&&(responseText=responseText.replace("history.back()","location.reload()"),document.open(),document.write(responseText),document.close()),console.error(err)}})}},{key:"render",value:function(){var form=this.state.form;form.IsPhantom.value=this.state.formData.IsPhantom,form.candID.value=this.state.formData.candID,form.pSCID.value=this.state.formData.pSCID,form.visitLabel.value=this.state.formData.visitLabel,form.mri_file.value=this.state.formData.mri_file;var btnClass=this.state.uploadProgress>-1?"btn btn-primary hide":void 0,notes="File name must be of type .tgz or tar.gz or .zip. Uploads cannot exceed "+this.props.maxUploadSize;return React.createElement("div",{className:"row"},React.createElement("div",{className:"col-md-7"},React.createElement("h3",null,"Upload an imaging scan"),React.createElement("br",null),React.createElement(FormElement,{name:"upload_form",formElements:form,fileUpload:!0,onUserInput:this.onFormChange},React.createElement(StaticElement,{label:"Notes",text:notes}),React.createElement("div",{className:"row"},React.createElement("div",{className:"col-sm-9 col-sm-offset-3"},React.createElement(_ProgressBar2.default,{value:this.state.uploadProgress}))),React.createElement(ButtonElement,{onUserInput:this.submitForm,buttonClass:btnClass}))))}}]),UploadForm}(React.Component);UploadForm.propTypes={},UploadForm.defaultProps={},exports.default=UploadForm},function(module,exports){
+"use strict";function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}Object.defineProperty(exports,"__esModule",{value:!0});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),ProgressBar=function(_React$Component){function ProgressBar(){return _classCallCheck(this,ProgressBar),_possibleConstructorReturn(this,(ProgressBar.__proto__||Object.getPrototypeOf(ProgressBar)).apply(this,arguments))}return _inherits(ProgressBar,_React$Component),_createClass(ProgressBar,[{key:"render",value:function(){var progressStyle={display:this.props.value<0?"none":"block",backgroundColor:"#d3d3d3",height:"30px",position:"relative"},labelStyle={position:"absolute",top:0,left:0,zIndex:1e3,width:"100%",color:"#fff",textAlign:"center",lineHeight:"30px",fontWeight:"600"};return React.createElement("div",{className:"progress",style:progressStyle},React.createElement("div",{className:"progress-bar progress-bar-striped active",role:"progressbar","aria-valuemin":"0","aria-valuemax":"100","aria-valuenow":this.props.value,style:{width:this.props.value+"%"}}),React.createElement("span",{style:labelStyle},this.props.value,"%"))}}]),ProgressBar}(React.Component);ProgressBar.propTypes={value:React.PropTypes.number},ProgressBar.defaultProps={value:0},exports.default=ProgressBar},function(module,exports){"use strict";function formatColumn(column,cell,rowData,rowHeaders){function handleClick(dccid,e){loris.loadFilteredMenuClickHandler("imaging_browser/",{DCCID:dccid})(e)}function openViolatedScans(patientName,e){loris.loadFilteredMenuClickHandler("mri_violations/",{PatientName:patientName})(e)}if(loris.hiddenHeaders.indexOf(column)>-1)return null;var row={};rowHeaders.forEach(function(header,index){row[header]=rowData[index]},this);var cellStyle={whiteSpace:"nowrap"};if("Progress"===column){if("Failure"===cell)return cellStyle.color="#fff",React.createElement("td",{className:"label-danger",style:cellStyle},cell);if("In Progress..."===cell)return cellStyle.color="#fff",React.createElement("td",{className:"label-warning",style:cellStyle},cell);var created=row["Number Of MincCreated"],inserted=row["Number Of MincInserted"];return React.createElement("td",{style:cellStyle},cell," (",inserted," out of ",created,")")}if("Tarchive Info"===column){if(!cell||"0"===cell)return React.createElement("td",null);var url=loris.BaseURL+"/dicom_archive/viewDetails/?tarchiveID="+cell;return React.createElement("td",{style:cellStyle},React.createElement("a",{href:url},"View Details"))}if("Number Of MincInserted"===column&&cell>0)return React.createElement("td",{style:cellStyle},React.createElement("a",{onClick:handleClick.bind(null,row.CandID)},cell));if("Number Of MincCreated"===column){var violatedScans=void 0;if(row["Number Of MincCreated"]-row["Number Of MincInserted"]>0){var numViolatedScans=row["Number Of MincCreated"]-row["Number Of MincInserted"],patientName=row.PatientName;violatedScans=React.createElement("a",{onClick:openViolatedScans.bind(null,patientName)},"(",numViolatedScans," violated scans)")}return React.createElement("td",{style:cellStyle},cell," ",violatedScans)}return React.createElement("td",{style:cellStyle},cell)}Object.defineProperty(exports,"__esModule",{value:!0}),loris.hiddenHeaders=["PatientName"],exports.default=formatColumn}]);
 //# sourceMappingURL=index.js.map
\ No newline at end of file
diff --git a/modules/imaging_uploader/php/imaging_uploader.class.inc b/modules/imaging_uploader/php/imaging_uploader.class.inc
index 2dc3822c6a2..508508ee52c 100644
--- a/modules/imaging_uploader/php/imaging_uploader.class.inc
+++ b/modules/imaging_uploader/php/imaging_uploader.class.inc
@@ -33,6 +33,8 @@ class Imaging_Uploader extends \NDB_Menu_Filter_Form
 
     /**
      * ID of the uploaded file in mri_upload table (if upload successful).
+     * If the file is a reupload of an existing file, then it will be set to
+     * the ID of the original upload.
      */
     var $mri_upload_id;
 
@@ -57,7 +59,7 @@ class Imaging_Uploader extends \NDB_Menu_Filter_Form
     /**
      * Sets up the Filter Variables
      *
-     * @return boolean
+     * @return void
      */
     function _setupVariables()
     {
@@ -106,7 +108,7 @@ class Imaging_Uploader extends \NDB_Menu_Filter_Form
      /**
      * Sets up the smarty menu filter items for the imaging uploader
      *
-     * @return none
+     * @return void
      */
     function setup()
     {
@@ -294,7 +296,7 @@ class Imaging_Uploader extends \NDB_Menu_Filter_Form
             ///////////////////////////////////////////////////////////////////////
             $pcv  = $pscid . "_" . $candid . "_" . $visit_label;
             $pcvu = $pcv . "_";
-            if ((!preg_match("/{$pcv}\.(zip|tgz|tar.gz)/", $file_name))
+            if ((!preg_match("/^{$pcv}\.(zip|tgz|tar.gz)/", $file_name))
                 && (!preg_match("/^{$pcvu}.*(\.(zip|tgz|tar.gz))/", $file_name))
             ) {
                     $errors[] = "File name must match " . $pcv .
@@ -453,6 +455,8 @@ class Imaging_Uploader extends \NDB_Menu_Filter_Form
             );
             if (!empty($id)) {
                 $db->update('mri_upload', $values, array('UploadID' => $id));
+                $this->mri_upload_id = $id;
+
                 return true;
             }
         }
@@ -658,7 +662,7 @@ class Imaging_Uploader extends \NDB_Menu_Filter_Form
      * Converts the results of this menu filter to a JSON format to be retrieved
      * with ?format=json
      *
-     * @return a json encoded string of the headers and data from this table
+     * @return string a json encoded string of the headers and data from this table
      */
     function toJSON()
     {
diff --git a/modules/imaging_uploader/test/TestPlan.md b/modules/imaging_uploader/test/TestPlan.md
index db50af9eca2..da44facd4cd 100644
--- a/modules/imaging_uploader/test/TestPlan.md
+++ b/modules/imaging_uploader/test/TestPlan.md
@@ -66,11 +66,18 @@
     (PSCID and visit label should be correct though). Check that an appropriate message is written in the Console 
     Output.
     [Manual Testing]
-18. Upload a valid, anonymized .tar.gz DICOM archive but with a PSCID that does not match the one in the archive 
+18. First, set the config setting 'ImagingUploader auto launch' to 'Yes'. Then, edit your prod file (in
+	<LORIS MRI code dir>/dicom-archive/.loris-mri) and comment out the definition of the @db array. Once these operations
+	are done, upload any valid scan: check in the server processes manager that this fails with an error code of 4.
+	Now try to upload the scan again. When the system asks you if you want to overwrite the existing 
+	archive, answer 'Yes'. Check that this reupload fails with error code 4 (and not 2). 
+	Related to Redmine#14093 and PR#3555.
+	[Manual Testing]
+19. Upload a valid, anonymized .tar.gz DICOM archive but with a PSCID that does not match the one in the archive 
     (CandID and visit label should be correct though). Check that an appropriate message is written in the Console 
     Output.
     [Automation Testing]
-19. Upload a valid, anonymized .tar.gz DICOM archive but with a visit label that does not match the one in the 
+20. Upload a valid, anonymized .tar.gz DICOM archive but with a visit label that does not match the one in the 
     archive (CandID and PSCID should be correct though). Check that an appropriate message is written in the Console 
     Output.
     [Automation Testing]
diff --git a/modules/instrument_builder/README.md b/modules/instrument_builder/README.md
new file mode 100644
index 00000000000..36fe648dd14
--- /dev/null
+++ b/modules/instrument_builder/README.md
@@ -0,0 +1,31 @@
+# Instrument Builder
+
+## Purpose
+
+The instrument builder provides a graphical interface for users to
+design and build instruments to be installed on a LORIS instance.
+
+## Intended Users
+
+The instrument builder is intended to be used by non-programmers who
+need to construct instruments to install in LORIS.
+
+## Scope
+
+The instrument builder module only builds the instrument and saves them
+to the user's local filesystem. It does not install the instrument
+(see: the `instrument_manager` module for that) or provide data entry
+capabilities.
+
+## Permissions
+
+The `instrument_builder` permission is required to access the module.
+
+## Configurations
+
+None.
+
+## Interactions with LORIS
+
+None. (The instrument builder is entirely written in client-side
+javascript.)
diff --git a/modules/instrument_builder/js/react.instrument_builder.js b/modules/instrument_builder/js/react.instrument_builder.js
index ef1e44b2ea5..a56440344b0 100644
--- a/modules/instrument_builder/js/react.instrument_builder.js
+++ b/modules/instrument_builder/js/react.instrument_builder.js
@@ -1,2 +1,2 @@
-!function(modules){function __webpack_require__(moduleId){if(installedModules[moduleId])return installedModules[moduleId].exports;var module=installedModules[moduleId]={exports:{},id:moduleId,loaded:!1};return modules[moduleId].call(module.exports,module,module.exports,__webpack_require__),module.loaded=!0,module.exports}var installedModules={};return __webpack_require__.m=modules,__webpack_require__.c=installedModules,__webpack_require__.p="",__webpack_require__(0)}({0:function(module,exports,__webpack_require__){"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source)Object.prototype.hasOwnProperty.call(source,key)&&(target[key]=source[key])}return target},_Tabs=__webpack_require__(9),LoadPane=React.createClass({displayName:"LoadPane",getInitialState:function(){return{alert:""}},chooseFile:function(e){var value=e.target.files[0];this.setState({file:value,alert:""})},setAlert:function(type,message){this.setState({alert:type,alertMessage:message})},resetAlert:function(){this.setState({alert:"",alertMessage:""})},loadFile:function(){var callback={success:this.props.loadCallback,error:this.setAlert};Instrument.load(this.state.file,callback)},render:function(){var alert="";switch(this.state.alert){case"success":alert=React.createElement("div",{className:"alert alert-success alert-dismissible",role:"alert"},React.createElement("button",{type:"button",className:"close",onClick:this.resetAlert},React.createElement("span",{"aria-hidden":"true"},"×")),React.createElement("strong",null,"Success!")," Instrument Loaded");break;case"typeError":alert=React.createElement("div",{className:"alert alert-danger alert-dismissible",role:"alert"},React.createElement("button",{type:"button",className:"close",onClick:this.resetAlert},React.createElement("span",{"aria-hidden":"true"},"×")),React.createElement("strong",null,"Error!")," Wrong file format");break;case"duplicateEntry":alert=React.createElement("div",{className:"alert alert-danger alert-dismissible",role:"alert"},React.createElement("button",{type:"button",className:"close",onClick:this.resetAlert},React.createElement("span",{"aria-hidden":"true"},"×")),React.createElement("strong",null,"Error!"),React.createElement("br",null),this.state.alertMessage)}return React.createElement(_Tabs.TabPane,_extends({Title:"Load Instrument"},this.props),React.createElement("div",{className:"col-sm-6 col-xs-12"},alert,React.createElement("input",{className:"fileUpload",type:"file",id:"instfile",onChange:this.chooseFile}),React.createElement("input",{className:"btn btn-primary spacingTop",type:"button",id:"load",value:"Load Instrument",onClick:this.loadFile})))}}),SavePane=React.createClass({displayName:"SavePane",getInitialState:function(){return{fileName:"",instrumentName:""}},loadState:function(newState){this.setState({fileName:newState.fileName,instrumentName:newState.instrumentName})},onChangeFile:function(e){var value=e.target.value;this.setState({fileName:value})},onChangeInst:function(e){var value=e.target.value;this.setState({instrumentName:value})},render:function(){var value=this.state.fileName;return React.createElement(_Tabs.TabPane,_extends({Title:"Save Instrument"},this.props),React.createElement("div",{className:"form-group"},React.createElement("div",{className:"col-xs-12"},React.createElement("label",{className:"col-sm-2 control-label"},"Filename: "),React.createElement("div",{className:"col-sm-4"},React.createElement("input",{className:"form-control",type:"text",id:"filename",value:value,onChange:this.onChangeFile}))),React.createElement("div",{className:"col-xs-12 spacingTop"},React.createElement("label",{className:"col-sm-2 control-label"},"Instrument Name: "),React.createElement("div",{className:"col-sm-4"},React.createElement("input",{className:"form-control",type:"text",id:"longname",value:this.state.instrumentName,onChange:this.onChangeInst}))),React.createElement("div",{className:"col-xs-12 spacingTop"},React.createElement("div",{className:"col-xs-12 col-sm-4 col-sm-offset-2"},React.createElement("input",{className:"btn btn-primary col-xs-12",type:"submit",value:"Save",onClick:this.props.save})))))}}),DisplayElements=React.createClass({displayName:"DisplayElements",getPlaceholder:function(){if(!this.placeholder){var tr=document.createElement("tr");tr.className="placeholder";var td=document.createElement("td");td.colSpan=2,td.appendChild(document.createTextNode("Drop here")),tr.appendChild(td),this.placeholder=tr}return this.placeholder},getTableRow:function(element){return"tr"===element.tagName?element:$(element).closest("tr")[0]},dragStart:function(e){this.dragged=this.getTableRow(e.currentTarget),e.dataTransfer.effectAllowed="move",e.dataTransfer.setData("text/html",e.currentTarget)},dragEnd:function(e){this.dragged.style.display="table-row",this.dragged.parentNode.removeChild(this.getPlaceholder());var data=this.props.elements,from=Number(this.dragged.dataset.id),to=Number(this.over.dataset.id);from<to&&to--,"after"===this.nodePlacement&&to++,data.splice(to,0,data.splice(from,1)[0]),this.setState({data:data})},dragOver:function(e){e.preventDefault();var targetRow=this.getTableRow(e.target);if(this.dragged.style.display="none","placeholder"!==targetRow.className){this.over=targetRow;var relY=e.pageY-$(this.over).offset().top,height=this.over.offsetHeight/2,parent=targetRow.parentNode;relY>=height?(this.nodePlacement="after",parent.insertBefore(this.getPlaceholder(),targetRow.nextElementSibling)):(this.nodePlacement="before",parent.insertBefore(this.getPlaceholder(),targetRow))}},render:function(){var tableRows=this.props.elements.map(function(element,i){var row=void 0,colStyles={wordWrap:"break-word"};return row=element.editing?React.createElement("tr",{"data-id":i,key:i,draggable:this.props.draggable,onDragEnd:this.dragEnd,onDragStart:this.dragStart},React.createElement("td",{className:"col-xs-2",colSpan:"3"},React.createElement(AddElement,{updateQuestions:this.props.updateElement,element:element,index:i}))):React.createElement("tr",{"data-id":i,key:i,draggable:this.props.draggable,onDragEnd:this.dragEnd,onDragStart:this.dragStart},React.createElement("td",{style:colStyles},element.Name),React.createElement("td",{style:colStyles},React.createElement(LorisElement,{element:element})),React.createElement("td",{style:colStyles},React.createElement("button",{onClick:this.props.editElement.bind(null,i),className:"button"},"Edit"),React.createElement("button",{onClick:this.props.deleteElement.bind(null,i),className:"button"},"Delete")))}.bind(this)),tableStyles={tableLayout:"fixed"};return React.createElement("table",{id:"sortable",className:"table table-hover",style:tableStyles},React.createElement("thead",null,React.createElement("tr",null,React.createElement("th",{className:"col-xs-2"},"Database Name"),React.createElement("th",{className:"col-xs-6"},"Question Display (Front End)"),React.createElement("th",{className:"col-xs-4"},"Edit"))),React.createElement("tbody",{onDragOver:this.dragOver},tableRows))}}),BuildPane=React.createClass({displayName:"BuildPane",getInitialState:function(){return{Elements:[{Type:"ElementGroup",GroupType:"Page",Description:"Top",Elements:[]}],amountEditing:0,currentPage:0,elementDBNames:{}}},loadElements:function(elements){var elContent=elements[this.state.currentPage].Elements,elNames={};elContent.forEach(function(el){elNames[el.Name]=""}),this.setState({Elements:elements,elementDBNames:elNames})},editElement:function(elementIndex){this.setState(function(state){var temp=state.Elements,edit=state.amountEditing+1,dbNames=state.elementDBNames;return delete dbNames[temp[state.currentPage].Elements[elementIndex].Name],temp[state.currentPage].Elements[elementIndex].editing=!0,{Elements:temp,amountEditing:edit,elementDBNames:dbNames}})},deleteElement:function(elementIndex){this.setState(function(state){var temp=state.Elements,dbNames=state.elementDBNames;return delete dbNames[temp[state.currentPage].Elements[elementIndex].Name],temp[state.currentPage].Elements.splice(elementIndex,1),{Elements:temp}})},updateElement:function(element,index){return!(element.Name&&element.Name in this.state.elementDBNames)&&(this.setState(function(state){var temp=state.Elements,edit=state.amountEditing-1,dbNa=state.elementDBNames;return temp[state.currentPage].Elements[index]=element,element.Name&&(dbNa[element.Name]=""),{Elements:temp,amountEditing:edit,elementDBNames:dbNa}}),!0)},addQuestion:function(element){return!(element.Name&&element.Name in this.state.elementDBNames)&&(this.setState(function(state){var temp=state.Elements,dbNa=state.elementDBNames;return element.Name&&(dbNa[element.Name]=""),temp[state.currentPage].Elements.push(element),{Elements:temp,elementDBNames:dbNa}}),!0)},addPage:function(pageName){this.setState(function(state){var temp=state.Elements,page=state.currentPage+1;return temp.push({Type:"ElementGroup",GroupType:"Page",Description:pageName,Elements:[]}),{Elements:temp,currentPage:page}})},selectPage:function(index){this.setState({currentPage:index})},render:function(){var draggable=0===this.state.amountEditing,pages=this.state.Elements.map(function(element,i){return React.createElement("li",{key:i,onClick:this.selectPage.bind(null,i)},React.createElement("a",null,this.state.Elements[i].Description))}.bind(this));return React.createElement(_Tabs.TabPane,_extends({Title:"Build Instrument"},this.props),React.createElement("div",{className:"form-group col-xs-12"},React.createElement("label",{htmlFor:"selected-input",className:"col-xs-2 col-sm-1 control-label"},"Page:"),React.createElement("div",{className:"col-sm-4"},React.createElement("div",{className:"btn-group"},React.createElement("button",{id:"selected-input",type:"button",className:"btn btn-default dropdown-toggle","data-toggle":"dropdown"},React.createElement("span",{id:"search_concept"},this.state.Elements[this.state.currentPage].Description),React.createElement("span",{className:"caret"})),React.createElement("ul",{className:"dropdown-menu",role:"menu"},pages)))),React.createElement(DisplayElements,{elements:this.state.Elements[this.state.currentPage].Elements,editElement:this.editElement,deleteElement:this.deleteElement,updateElement:this.updateElement,draggable:draggable}),React.createElement("div",{className:"row"},React.createElement(AddElement,{updateQuestions:this.addQuestion,addPage:this.addPage})))}}),InstrumentBuilderApp=React.createClass({displayName:"InstrumentBuilderApp",saveInstrument:function(){Instrument.save(this.refs.savePane.state,this.refs.buildPane.state.Elements)},loadCallback:function(elements,info){this.refs.savePane.loadState(info),this.refs.buildPane.loadElements(elements),this.refs.loadPane.setAlert("success")},render:function(){var tabs=[];tabs.push(React.createElement(LoadPane,{TabId:"Load",ref:"loadPane",loadCallback:this.loadCallback,key:1})),tabs.push(React.createElement(BuildPane,{TabId:"Build",ref:"buildPane",key:2})),tabs.push(React.createElement(SavePane,{TabId:"Save",ref:"savePane",save:this.saveInstrument,key:3}));var tabList=[{id:"Load",label:"Load"},{id:"Build",label:"Build"},{id:"Save",label:"Save"}];return React.createElement("div",null,React.createElement(_Tabs.Tabs,{tabs:tabList,defaultTab:"Build"},tabs))}}),RInstrumentBuilderApp=React.createFactory(InstrumentBuilderApp);window.RInstrumentBuilderApp=RInstrumentBuilderApp,exports.default=InstrumentBuilderApp},9:function(module,exports){"use strict";function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}Object.defineProperty(exports,"__esModule",{value:!0});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),Tabs=function(_React$Component){function Tabs(props){_classCallCheck(this,Tabs);var _this=_possibleConstructorReturn(this,(Tabs.__proto__||Object.getPrototypeOf(Tabs)).call(this,props)),hash=window.location.hash,activeTab="";return _this.props.updateURL&&hash?activeTab=hash.substr(1):_this.props.defaultTab?activeTab=_this.props.defaultTab:_this.props.tabs.length>0&&(activeTab=_this.props.tabs[0].id),_this.state={activeTab:activeTab},_this.handleClick=_this.handleClick.bind(_this),_this.getTabs=_this.getTabs.bind(_this),_this.getTabPanes=_this.getTabPanes.bind(_this),_this}return _inherits(Tabs,_React$Component),_createClass(Tabs,[{key:"handleClick",value:function(tabId,e){if(this.setState({activeTab:tabId}),this.props.onTabChange(tabId),this.props.updateURL){var scrollDistance=$("body").scrollTop()||$("html").scrollTop();window.location.hash=e.target.hash,$("html,body").scrollTop(scrollDistance)}}},{key:"getTabs",value:function(){var tabs=this.props.tabs.map(function(tab){var tabClass=this.state.activeTab===tab.id?"active":null,href="#"+tab.id,tabID="tab-"+tab.id;return React.createElement("li",{role:"presentation",className:tabClass,key:tab.id},React.createElement("a",{id:tabID,href:href,role:"tab","data-toggle":"tab",onClick:this.handleClick.bind(null,tab.id)},tab.label))}.bind(this));return tabs}},{key:"getTabPanes",value:function(){var tabPanes=React.Children.map(this.props.children,function(child,key){if(child)return React.cloneElement(child,{activeTab:this.state.activeTab,key:key})}.bind(this));return tabPanes}},{key:"render",value:function(){var tabs=this.getTabs(),tabPanes=this.getTabPanes(),tabStyle={marginLeft:0,marginBottom:"5px"};return React.createElement("div",null,React.createElement("ul",{className:"nav nav-tabs",role:"tablist",style:tabStyle},tabs),React.createElement("div",{className:"tab-content"},tabPanes))}}]),Tabs}(React.Component);Tabs.propTypes={tabs:React.PropTypes.array.isRequired,defaultTab:React.PropTypes.string,updateURL:React.PropTypes.bool},Tabs.defaultProps={onTabChange:function(){},updateURL:!1};var TabPane=function(_React$Component2){function TabPane(){return _classCallCheck(this,TabPane),_possibleConstructorReturn(this,(TabPane.__proto__||Object.getPrototypeOf(TabPane)).apply(this,arguments))}return _inherits(TabPane,_React$Component2),_createClass(TabPane,[{key:"render",value:function(){var classList="tab-pane",title=void 0;return this.props.TabId===this.props.activeTab&&(classList+=" active"),this.props.Title&&(title=React.createElement("h1",null,this.props.Title)),React.createElement("div",{role:"tabpanel",className:classList,id:this.props.TabId},title,this.props.children)}}]),TabPane}(React.Component);TabPane.propTypes={TabId:React.PropTypes.string.isRequired,Title:React.PropTypes.string,activeTab:React.PropTypes.string},exports.Tabs=Tabs,exports.TabPane=TabPane}});
+!function(modules){function __webpack_require__(moduleId){if(installedModules[moduleId])return installedModules[moduleId].exports;var module=installedModules[moduleId]={exports:{},id:moduleId,loaded:!1};return modules[moduleId].call(module.exports,module,module.exports,__webpack_require__),module.loaded=!0,module.exports}var installedModules={};return __webpack_require__.m=modules,__webpack_require__.c=installedModules,__webpack_require__.p="",__webpack_require__(0)}({0:function(module,exports,__webpack_require__){"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source)Object.prototype.hasOwnProperty.call(source,key)&&(target[key]=source[key])}return target},_Tabs=__webpack_require__(9),LoadPane=React.createClass({displayName:"LoadPane",getInitialState:function(){return{alert:""}},chooseFile:function(e){var value=e.target.files[0];this.setState({file:value,alert:""})},setAlert:function(type,message){this.setState({alert:type,alertMessage:message})},resetAlert:function(){this.setState({alert:"",alertMessage:""})},loadFile:function(){var callback={success:this.props.loadCallback,error:this.setAlert};Instrument.load(this.state.file,callback)},render:function(){var alert="";switch(this.state.alert){case"success":alert=React.createElement("div",{className:"alert alert-success alert-dismissible",role:"alert"},React.createElement("button",{type:"button",className:"close",onClick:this.resetAlert},React.createElement("span",{"aria-hidden":"true"},"×")),React.createElement("strong",null,"Success!")," Instrument Loaded");break;case"typeError":alert=React.createElement("div",{className:"alert alert-danger alert-dismissible",role:"alert"},React.createElement("button",{type:"button",className:"close",onClick:this.resetAlert},React.createElement("span",{"aria-hidden":"true"},"×")),React.createElement("strong",null,"Error!")," Wrong file format");break;case"duplicateEntry":alert=React.createElement("div",{className:"alert alert-danger alert-dismissible",role:"alert"},React.createElement("button",{type:"button",className:"close",onClick:this.resetAlert},React.createElement("span",{"aria-hidden":"true"},"×")),React.createElement("strong",null,"Error!"),React.createElement("br",null),this.state.alertMessage)}return React.createElement(_Tabs.TabPane,_extends({Title:"Load Instrument"},this.props),React.createElement("div",{className:"col-sm-6 col-xs-12"},alert,React.createElement("input",{className:"fileUpload",type:"file",id:"instfile",onChange:this.chooseFile}),React.createElement("input",{className:"btn btn-primary spacingTop",type:"button",id:"load",value:"Load Instrument",onClick:this.loadFile})))}}),SavePane=React.createClass({displayName:"SavePane",getInitialState:function(){return{fileName:"",instrumentName:""}},loadState:function(newState){this.setState({fileName:newState.fileName,instrumentName:newState.instrumentName})},onChangeFile:function(e){var value=e.target.value;this.setState({fileName:value})},onChangeInst:function(e){var value=e.target.value;this.setState({instrumentName:value})},render:function(){var value=this.state.fileName;return React.createElement(_Tabs.TabPane,_extends({Title:"Save Instrument"},this.props),React.createElement("div",{className:"form-group"},React.createElement("div",{className:"col-xs-12"},React.createElement("label",{className:"col-sm-2 control-label"},"Filename: "),React.createElement("div",{className:"col-sm-4"},React.createElement("input",{className:"form-control",type:"text",id:"filename",value:value,onChange:this.onChangeFile}))),React.createElement("div",{className:"col-xs-12 spacingTop"},React.createElement("label",{className:"col-sm-2 control-label"},"Instrument Name: "),React.createElement("div",{className:"col-sm-4"},React.createElement("input",{className:"form-control",type:"text",id:"longname",value:this.state.instrumentName,onChange:this.onChangeInst}))),React.createElement("div",{className:"col-xs-12 spacingTop"},React.createElement("div",{className:"col-xs-12 col-sm-4 col-sm-offset-2"},React.createElement("input",{className:"btn btn-primary col-xs-12",type:"submit",value:"Save",onClick:this.props.save})))))}}),DisplayElements=React.createClass({displayName:"DisplayElements",getPlaceholder:function(){if(!this.placeholder){var tr=document.createElement("tr");tr.className="placeholder";var td=document.createElement("td");td.colSpan=2,td.appendChild(document.createTextNode("Drop here")),tr.appendChild(td),this.placeholder=tr}return this.placeholder},getTableRow:function(element){return"tr"===element.tagName?element:$(element).closest("tr")[0]},dragStart:function(e){this.dragged=this.getTableRow(e.currentTarget),e.dataTransfer.effectAllowed="move",e.dataTransfer.setData("text/html",e.currentTarget)},dragEnd:function(e){this.dragged.style.display="table-row",this.dragged.parentNode.removeChild(this.getPlaceholder());var data=this.props.elements,from=Number(this.dragged.dataset.id),to=Number(this.over.dataset.id);from<to&&to--,"after"===this.nodePlacement&&to++,data.splice(to,0,data.splice(from,1)[0]),this.setState({data:data})},dragOver:function(e){e.preventDefault();var targetRow=this.getTableRow(e.target);if(this.dragged.style.display="none","placeholder"!==targetRow.className){this.over=targetRow;var relY=e.pageY-$(this.over).offset().top,height=this.over.offsetHeight/2,parent=targetRow.parentNode;relY>=height?(this.nodePlacement="after",parent.insertBefore(this.getPlaceholder(),targetRow.nextElementSibling)):(this.nodePlacement="before",parent.insertBefore(this.getPlaceholder(),targetRow))}},render:function(){var tableRows=this.props.elements.map(function(element,i){var row=void 0,colStyles={wordWrap:"break-word"};return row=element.editing?React.createElement("tr",{"data-id":i,key:i,draggable:this.props.draggable,onDragEnd:this.dragEnd,onDragStart:this.dragStart},React.createElement("td",{className:"col-xs-2",colSpan:"3"},React.createElement(AddElement,{updateQuestions:this.props.updateElement,element:element,index:i}))):React.createElement("tr",{"data-id":i,key:i,draggable:this.props.draggable,onDragEnd:this.dragEnd,onDragStart:this.dragStart},React.createElement("td",{style:colStyles},element.Name),React.createElement("td",{style:colStyles},React.createElement(LorisElement,{element:element})),React.createElement("td",{style:colStyles},React.createElement("button",{onClick:this.props.editElement.bind(null,i),className:"button"},"Edit"),React.createElement("button",{onClick:this.props.deleteElement.bind(null,i),className:"button"},"Delete")))}.bind(this)),tableStyles={tableLayout:"fixed"};return React.createElement("table",{id:"sortable",className:"table table-hover",style:tableStyles},React.createElement("thead",null,React.createElement("tr",null,React.createElement("th",{className:"col-xs-2"},"Database Name"),React.createElement("th",{className:"col-xs-6"},"Question Display (Front End)"),React.createElement("th",{className:"col-xs-4"},"Edit"))),React.createElement("tbody",{onDragOver:this.dragOver},tableRows))}}),BuildPane=React.createClass({displayName:"BuildPane",getInitialState:function(){return{Elements:[{Type:"ElementGroup",GroupType:"Page",Description:"Top",Elements:[]}],amountEditing:0,currentPage:0,elementDBNames:{}}},loadElements:function(elements){var elContent=elements[this.state.currentPage].Elements,elNames={};elContent.forEach(function(el){elNames[el.Name]=""}),this.setState({Elements:elements,elementDBNames:elNames})},editElement:function(elementIndex){this.setState(function(state){var temp=state.Elements,edit=state.amountEditing+1,dbNames=state.elementDBNames;return delete dbNames[temp[state.currentPage].Elements[elementIndex].Name],temp[state.currentPage].Elements[elementIndex].editing=!0,{Elements:temp,amountEditing:edit,elementDBNames:dbNames}})},deleteElement:function(elementIndex){this.setState(function(state){var temp=state.Elements,dbNames=state.elementDBNames;return delete dbNames[temp[state.currentPage].Elements[elementIndex].Name],temp[state.currentPage].Elements.splice(elementIndex,1),{Elements:temp}})},updateElement:function(element,index){return!(element.Name&&element.Name in this.state.elementDBNames)&&(this.setState(function(state){var temp=state.Elements,edit=state.amountEditing-1,dbNa=state.elementDBNames;return temp[state.currentPage].Elements[index]=element,element.Name&&(dbNa[element.Name]=""),{Elements:temp,amountEditing:edit,elementDBNames:dbNa}}),!0)},addQuestion:function(element){return!(element.Name&&element.Name in this.state.elementDBNames)&&(this.setState(function(state){var temp=state.Elements,dbNa=state.elementDBNames;return element.Name&&(dbNa[element.Name]=""),temp[state.currentPage].Elements.push(element),{Elements:temp,elementDBNames:dbNa}}),!0)},addPage:function(pageName){this.setState(function(state){var temp=state.Elements,page=state.currentPage+1;return temp.push({Type:"ElementGroup",GroupType:"Page",Description:pageName,Elements:[]}),{Elements:temp,currentPage:page}})},selectPage:function(index){this.setState({currentPage:index})},render:function(){var draggable=0===this.state.amountEditing,pages=this.state.Elements.map(function(element,i){return React.createElement("li",{key:i,onClick:this.selectPage.bind(null,i)},React.createElement("a",null,this.state.Elements[i].Description))}.bind(this));return React.createElement(_Tabs.TabPane,_extends({Title:"Build Instrument"},this.props),React.createElement("div",{className:"form-group col-xs-12"},React.createElement("label",{htmlFor:"selected-input",className:"col-xs-2 col-sm-1 control-label"},"Page:"),React.createElement("div",{className:"col-sm-4"},React.createElement("div",{className:"btn-group"},React.createElement("button",{id:"selected-input",type:"button",className:"btn btn-default dropdown-toggle","data-toggle":"dropdown"},React.createElement("span",{id:"search_concept"},this.state.Elements[this.state.currentPage].Description),React.createElement("span",{className:"caret"})),React.createElement("ul",{className:"dropdown-menu",role:"menu"},pages)))),React.createElement(DisplayElements,{elements:this.state.Elements[this.state.currentPage].Elements,editElement:this.editElement,deleteElement:this.deleteElement,updateElement:this.updateElement,draggable:draggable}),React.createElement("div",{className:"row"},React.createElement(AddElement,{updateQuestions:this.addQuestion,addPage:this.addPage})))}}),InstrumentBuilderApp=React.createClass({displayName:"InstrumentBuilderApp",saveInstrument:function(){Instrument.save(this.refs.savePane.state,this.refs.buildPane.state.Elements)},loadCallback:function(elements,info){this.refs.savePane.loadState(info),this.refs.buildPane.loadElements(elements),this.refs.loadPane.setAlert("success")},render:function(){var tabs=[];tabs.push(React.createElement(LoadPane,{TabId:"Load",ref:"loadPane",loadCallback:this.loadCallback,key:1})),tabs.push(React.createElement(BuildPane,{TabId:"Build",ref:"buildPane",key:2})),tabs.push(React.createElement(SavePane,{TabId:"Save",ref:"savePane",save:this.saveInstrument,key:3}));var tabList=[{id:"Load",label:"Load"},{id:"Build",label:"Build"},{id:"Save",label:"Save"}];return React.createElement("div",null,React.createElement(_Tabs.Tabs,{tabs:tabList,defaultTab:"Build"},tabs))}}),RInstrumentBuilderApp=React.createFactory(InstrumentBuilderApp);window.RInstrumentBuilderApp=RInstrumentBuilderApp,exports.default=InstrumentBuilderApp},9:function(module,exports){"use strict";function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}Object.defineProperty(exports,"__esModule",{value:!0});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),Tabs=function(_React$Component){function Tabs(props){_classCallCheck(this,Tabs);var _this=_possibleConstructorReturn(this,(Tabs.__proto__||Object.getPrototypeOf(Tabs)).call(this,props)),hash=window.location.hash,activeTab="";return _this.props.updateURL&&hash?activeTab=hash.substr(1):_this.props.defaultTab?activeTab=_this.props.defaultTab:_this.props.tabs.length>0&&(activeTab=_this.props.tabs[0].id),_this.state={activeTab:activeTab},_this.handleClick=_this.handleClick.bind(_this),_this.getTabs=_this.getTabs.bind(_this),_this.getTabPanes=_this.getTabPanes.bind(_this),_this}return _inherits(Tabs,_React$Component),_createClass(Tabs,[{key:"handleClick",value:function(tabId,e){if(this.setState({activeTab:tabId}),this.props.onTabChange(tabId),this.props.updateURL){var scrollDistance=$("body").scrollTop()||$("html").scrollTop();window.location.hash=e.target.hash,$("html,body").scrollTop(scrollDistance)}}},{key:"getTabs",value:function(){var tabs=this.props.tabs.map(function(tab){var tabClass=this.state.activeTab===tab.id?"active":null,href="#"+tab.id,tabID="tab-"+tab.id;return React.createElement("li",{role:"presentation",className:tabClass,key:tab.id},React.createElement("a",{id:tabID,href:href,role:"tab","data-toggle":"tab",onClick:this.handleClick.bind(null,tab.id)},tab.label))}.bind(this));return tabs}},{key:"getTabPanes",value:function(){var tabPanes=React.Children.map(this.props.children,function(child,key){if(child)return React.cloneElement(child,{activeTab:this.state.activeTab,key:key})}.bind(this));return tabPanes}},{key:"render",value:function(){var tabs=this.getTabs(),tabPanes=this.getTabPanes(),tabStyle={marginLeft:0,marginBottom:"5px"};return React.createElement("div",null,React.createElement("ul",{className:"nav nav-tabs",role:"tablist",style:tabStyle},tabs),React.createElement("div",{className:"tab-content"},tabPanes))}}]),Tabs}(React.Component);Tabs.propTypes={tabs:React.PropTypes.array.isRequired,defaultTab:React.PropTypes.string,updateURL:React.PropTypes.bool},Tabs.defaultProps={onTabChange:function(){},updateURL:!0};var VerticalTabs=function(_React$Component2){function VerticalTabs(props){_classCallCheck(this,VerticalTabs);var _this2=_possibleConstructorReturn(this,(VerticalTabs.__proto__||Object.getPrototypeOf(VerticalTabs)).call(this,props)),hash=window.location.hash,activeTab="";return _this2.props.updateURL&&hash?activeTab=hash.substr(1):_this2.props.defaultTab?activeTab=_this2.props.defaultTab:_this2.props.tabs.length>0&&(activeTab=_this2.props.tabs[0].id),_this2.state={activeTab:activeTab},_this2.handleClick=_this2.handleClick.bind(_this2),_this2.getTabs=_this2.getTabs.bind(_this2),_this2.getTabPanes=_this2.getTabPanes.bind(_this2),_this2}return _inherits(VerticalTabs,_React$Component2),_createClass(VerticalTabs,[{key:"handleClick",value:function(tabId,e){if(this.setState({activeTab:tabId}),this.props.onTabChange(tabId),this.props.updateURL){var scrollDistance=$("body").scrollTop()||$("html").scrollTop();window.location.hash=e.target.hash,$("html,body").scrollTop(scrollDistance)}}},{key:"getTabs",value:function(){var tabs=this.props.tabs.map(function(tab){var tabClass=this.state.activeTab===tab.id?"active":null,href="#"+tab.id,tabID="tab-"+tab.id;return React.createElement("li",{role:"presentation",className:tabClass,key:tab.id},React.createElement("a",{id:tabID,href:href,role:"tab","data-toggle":"tab",onClick:this.handleClick.bind(null,tab.id)},tab.label))}.bind(this));return tabs}},{key:"getTabPanes",value:function(){var tabPanes=React.Children.map(this.props.children,function(child,key){if(child)return React.cloneElement(child,{activeTab:this.state.activeTab,key:key})}.bind(this));return tabPanes}},{key:"render",value:function(){var tabs=this.getTabs(),tabPanes=this.getTabPanes(),tabStyle={marginLeft:0,marginBottom:"5px"};return React.createElement("div",null,React.createElement("div",{className:"tabbable col-md-3 col-sm-3"},React.createElement("ul",{className:"nav nav-pills nav-stacked",role:"tablist",style:tabStyle},tabs)),React.createElement("div",{className:"tab-content col-md-9 col-sm-9"},tabPanes))}}]),VerticalTabs}(React.Component);VerticalTabs.propTypes={tabs:React.PropTypes.array.isRequired,defaultTab:React.PropTypes.string,updateURL:React.PropTypes.bool},VerticalTabs.defaultProps={onTabChange:function(){},updateURL:!0};var TabPane=function(_React$Component3){function TabPane(){return _classCallCheck(this,TabPane),_possibleConstructorReturn(this,(TabPane.__proto__||Object.getPrototypeOf(TabPane)).apply(this,arguments))}return _inherits(TabPane,_React$Component3),_createClass(TabPane,[{key:"render",value:function(){var classList="tab-pane",title=void 0;return this.props.TabId===this.props.activeTab&&(classList+=" active"),this.props.Title&&(title=React.createElement("h1",null,this.props.Title)),React.createElement("div",{role:"tabpanel",className:classList,id:this.props.TabId},title,this.props.children)}}]),TabPane}(React.Component);TabPane.propTypes={TabId:React.PropTypes.string.isRequired,Title:React.PropTypes.string,activeTab:React.PropTypes.string},exports.Tabs=Tabs,exports.VerticalTabs=VerticalTabs,exports.TabPane=TabPane}});
 //# sourceMappingURL=react.instrument_builder.js.map
\ No newline at end of file
diff --git a/modules/instrument_builder/php/instrument_builder.class.inc b/modules/instrument_builder/php/instrument_builder.class.inc
index cb6b9a6fc60..a616d5d4b78 100644
--- a/modules/instrument_builder/php/instrument_builder.class.inc
+++ b/modules/instrument_builder/php/instrument_builder.class.inc
@@ -35,7 +35,7 @@ class Instrument_Builder extends \NDB_Form
      * Tests that, when loading the Instrument builder module, some
      * text appears in the body.
      *
-     * @return void
+     * @return bool
      */
     function _hasAccess()
     {
diff --git a/modules/instrument_list/README.md b/modules/instrument_list/README.md
new file mode 100644
index 00000000000..826096a2d42
--- /dev/null
+++ b/modules/instrument_list/README.md
@@ -0,0 +1,63 @@
+# Instrument List
+
+## Purpose
+
+The instrument list module shows an overview of all instruments
+which are part of a given session for a candidate. It provides a
+mechanism for setting session level behavioural QC flags and the
+ability to send a visit to DCC once the instruments are all complete.
+
+## Intended Users
+
+The page is intended to be used by data entry staff to access
+instruments for data entry. It is the primary entry point into a
+visit.
+
+## Scope
+
+The instrument list module provides a path to access the instruments,
+and a control panel which allows session level metadata to be
+entered.
+
+## Permissions
+
+One of three conditions must be met to have access to the module:
+
+1. The user has the permission `access_all_profiles`
+2. The user is at the same site as the visit.
+3. The user is at the same site as one of the candidate's other visits.
+
+The `send_to_dcc` permission is required in order to send the
+timepoint to DCC (finalize the visit).
+
+The separate (and usually more restricted) `unsend_to_dcc` permission
+is required to reverse the `send_to_dcc` in case it was sent in error
+(but should rarely be necessary, as 'Sent to DCC' implies that the data
+is complete and ready to be used for publication, after which it should
+be immutable.)
+
+## Configurations
+
+The instrument list module gets the list of instruments from the
+`flag` table. The test battery must separately be set up (and the
+stage started) in order for any instruments to appear.
+
+The `test_subgroups` SQL table provides a mechanism for grouping
+the instruments on the page into separate sections of the table.
+
+The `test_names` SQL table provides a mapping of short `test_name`
+to a friendly human readable display format which is shown in the
+list.
+
+## Interactions with LORIS
+
+The module primarily links to instruments, which are coded separately.
+It also includes a link to the `next_stage` module in the control
+panel, in order to allow data entry staff to start a visit.
+
+Survey module instruments are inserted into the `flag` table and thus
+show up in the `instrument_list` module, but this is not the case until
+after the survey has been sent.
+
+The `bvl_feedback` thread status for instruments are displayed in
+the list of instruments.
diff --git a/modules/instrument_list/php/instrument_list_controlpanel.class.inc b/modules/instrument_list/php/instrument_list_controlpanel.class.inc
index 6be563cd77f..9e9f289872d 100644
--- a/modules/instrument_list/php/instrument_list_controlpanel.class.inc
+++ b/modules/instrument_list/php/instrument_list_controlpanel.class.inc
@@ -280,29 +280,21 @@ class Instrument_List_ControlPanel extends \TimePoint
 
         // set the BVLQC flag
         $user =& \User::singleton();
-        if (isset($_REQUEST['setBVLQCStatus'])
+        if (!empty($_REQUEST['setBVLQCStatus'])
             && $user->hasPermission('bvl_feedback')
         ) {
-            $status = \Utility::nullifyEmpty(
-                $_REQUEST['setBVLQCStatus'],
-                'BVLQCStatus'
-            );
-            $this->setData('BVLQCStatus', $status);
+            $this->setData('BVLQCStatus', $_REQUEST['setBVLQCStatus']);
             return;
-        }
-        if (isset($_REQUEST['setBVLQCType']) && !empty($_REQUEST['setBVLQCType'])
-            && $user->hasPermission('bvl_feedback')
-        ) {
-            $QCtype = \Utility::nullifyEmpty(
-                $_REQUEST['setBVLQCType'],
-                'BVLQCType'
-            );
-            $this->setData('BVLQCType', $QCtype);
+        } else {
+            $this->setData('BVLQCStatus', null);
             return;
         }
-        if (empty($_REQUEST['setBVLQCType'])
+        if (!empty($_REQUEST['setBVLQCType'])
             && $user->hasPermission('bvl_feedback')
         ) {
+            $this->setData('BVLQCType', $_REQUEST['setBVLQCType']);
+            return;
+        } else {
             $this->setData('BVLQCType', null);
             return;
         }
diff --git a/modules/instrument_manager/README.md b/modules/instrument_manager/README.md
new file mode 100644
index 00000000000..a8777e45488
--- /dev/null
+++ b/modules/instrument_manager/README.md
@@ -0,0 +1,52 @@
+# Instrument Manager
+
+## Purpose
+
+The instrument manager is intended to view and manage instrument
+metadata for a LORIS instance as well as provide a centralized place
+to install instruments created from the instrument builder without
+backend access.
+
+It provides overview of the "health" of the various MySQL instrument
+tables and whether or not they are in sync with the instrument as it
+exists on the filesystem or not. However, the checks are only possible
+for LINST (instrument builder) instruments, as the appropriate state
+of database tables can not easily be statically determined for PHP
+instruments.
+
+## Intended Users
+
+The instrument manager is intended to be used by study or LORIS
+administrators to view and edit the instruments installed on a given
+LORIS instance.
+
+## Scope
+
+Only the instrument metadata is managed by the instrument manager.
+
+It does not concern itself with data collection or analysis,
+which are the responsibility of the instruments themselves, nor does
+it concern itself with the creation of instruments which is the
+responsibility of the `instrument_builder` module or PHP programmer. 
+The test battery is also managed seperately directly from the database.
+
+## Permissions
+
+The `instrument_manager` module requires the LORIS `superuser`
+permission to be accessed.
+
+## Configurations
+
+For basic access to the module, no configuration is required.
+
+In order to enable the ability to upload instruments, PHP must be
+able to write to the `project/instruments` and `project/tables_sql`
+directories (to write the instrument itself, and instrument table
+patch respectively.)
+
+In order to automatically source the SQL patch and fully configure
+LINST instruments, the LORIS `quatUser` and `quatPassword` configuration
+must be set to a user which has the MySQL `CREATE TABLE` permission.
+(The name `quatUser` and `quatPassword` is an anachronism and should
+be renamed.)
+
diff --git a/modules/instrument_manager/help/instrument_manager.md b/modules/instrument_manager/help/instrument_manager.md
index e544c5babdb..b827a0c40df 100644
--- a/modules/instrument_manager/help/instrument_manager.md
+++ b/modules/instrument_manager/help/instrument_manager.md
@@ -1,6 +1,54 @@
 # Instrument manager
 
-The Instrument Manager module allows LORIS Admin-level superusers to upload and install instrument forms (*.linst files), and to monitor instrument status in LORIS.
+## Uploading Instruments
 
-To upload an instrument, users must select the file of the instrument they wish to upload from their computer by clicking the “Browse” button. 
-Once the user has selected the file, they must press “Install Instrument” to finalize the installment of the instrument in LORIS.
\ No newline at end of file
+The instrument manager provides the ability to view the status of
+instruments that are installed in LORIS and, if configured, the
+ability to install new instruments created with the instrument
+builder.
+
+If configured, the top of the page displays an "Upload Instrument"
+section where a user can click "Browse" to select a LINST file from
+their computer.  After selecting a valid LINST file, clicking
+"Install Instrument" will install the instrument into LORIS (but
+it must still be manually inserted into a study specific test battery.)
+
+## Viewing Installed Instruments
+
+Below the "Upload Instrument" section is a table displaying all
+instruments which are currently installed in LORIS. For each
+instrument it displays the columns:
+
+*Instrument*: This provides the name of the instrument (as given
+in the `test_names` table).
+
+*Instrument Type*: This contains either "PHP" or "Instrument Builder",
+depending on if the instrument was created using the instrument
+builder or coded in PHP.
+
+*Table Installed*: This does a very basic check for each instruments
+and displays either "Exists" (or the instrument table exists in the
+LORIS SQL database) or "Missing" (if the instrument SQL table does
+not exist).
+
+*Table Valid*: This column displays whether the LORIS SQL database
+is correctly configured, with respect to the instrument that's
+installed in the LORIS `project/instruments` directory. It contains
+either of the following: 
+ - "Appears Valid" if everything looks peachy 
+ - "Column (name) invalid" if the SQL table exists, but the column 
+ named "(name)" does not reflect the type as configured in the 
+ instrument
+ - "enum (name) invalid" if the column exists, but does not accurately 
+ reflect the possible options in a select box
+ - "?" if it's unable to determine the validity of the table.
+
+*Pages Valid*: This column checks whether the `instrument_subtests`
+table in LORIS is correctly populated by verifying it against the
+instrument which is installed in LORIS. It contains either "Appears
+Valid" or "Missing page (pagename)" if a page is missing from the
+`instrument_subtests` table.
+
+Note that the last two columns can only be determined for LINST
+(instrument builder) instruments as there is no way to extract the
+"proper" values from instruments coded in PHP.
\ No newline at end of file
diff --git a/modules/instrument_manager/php/instrument_manager.class.inc b/modules/instrument_manager/php/instrument_manager.class.inc
index eb1a6d27084..16aef7b4a6f 100644
--- a/modules/instrument_manager/php/instrument_manager.class.inc
+++ b/modules/instrument_manager/php/instrument_manager.class.inc
@@ -88,7 +88,10 @@ class Instrument_Manager extends \NDB_Menu_Filter
             );
             if ($exists <= 0) {
                 $db_config = $config->getSetting('database');
-                exec("php generate_tables_sql_and_testNames.php < $new_file");
+                exec(
+                    'php generate_tables_sql_and_testNames.php < '
+                    . escapeshellarg($new_file)
+                );
 
                 $instrument = \NDB_BVL_Instrument::factory(
                     $instname,
@@ -108,7 +111,7 @@ class Instrument_Manager extends \NDB_Menu_Filter
                     " -p" . escapeshellarg($db_config['quatPassword']).
                     " " . escapeshellarg($db_config['database']).
                     " < " . $this->path . "project/tables_sql/".
-                    $instrument->table.".sql"
+                    escapeshellarg($instrument->table . '.sql')
                 );
             }
         }
diff --git a/modules/issue_tracker/ajax/EditIssue.php b/modules/issue_tracker/ajax/EditIssue.php
index 17d109d6df1..f222e86b7eb 100644
--- a/modules/issue_tracker/ajax/EditIssue.php
+++ b/modules/issue_tracker/ajax/EditIssue.php
@@ -429,8 +429,7 @@ function getComments($issueID)
         "FROM issues_history where issueID=:issueID " .
         "UNION " .
         "SELECT issueComment, 'comment', dateAdded, addedBy " .
-        "FROM issues_comments where issueID=:issueID " .
-        "ORDER BY dateAdded DESC",
+        "FROM issues_comments where issueID=:issueID ",
         array('issueID' => $issueID)
     );
 
@@ -496,7 +495,7 @@ function emailUser($issueID, $changed_assignee)
     );
 
     $msg_data['url']         = $baseurl .
-        "/issue_tracker/issue/?backURL=/issue_tracker/&issueID=" . $issueID;
+        "/issue_tracker/issue/?issueID=" . $issueID;
     $msg_data['issueID']     = $issueID;
     $msg_data['currentUser'] = $user->getUsername();
     $msg_data['title']       = $title;
@@ -534,7 +533,7 @@ function emailUser($issueID, $changed_assignee)
     );
 
     $msg_data['url']         = $baseurl .
-        "/issue_tracker/issue/?backURL=/issue_tracker/&issueID=" . $issueID;
+        "/issue_tracker/issue/?issueID=" . $issueID;
     $msg_data['issueID']     = $issueID;
     $msg_data['currentUser'] = $user->getUsername();
 
diff --git a/modules/issue_tracker/css/issue_tracker.css b/modules/issue_tracker/css/issue_tracker.css
index a74dd977623..e1bf02d1c30 100644
--- a/modules/issue_tracker/css/issue_tracker.css
+++ b/modules/issue_tracker/css/issue_tracker.css
@@ -72,3 +72,11 @@ h3 {
 .page-issue-tracker h3 {
   margin: 25px 0;
 }
+
+.history-item-label > span {
+  font-weight: bold;
+}
+
+.history-item-changes {
+  margin-left: 2em;
+}
diff --git a/modules/issue_tracker/js/columnFormatter.js b/modules/issue_tracker/js/columnFormatter.js
index 142d22cc83e..8fbb5cc0399 100644
--- a/modules/issue_tracker/js/columnFormatter.js
+++ b/modules/issue_tracker/js/columnFormatter.js
@@ -1,2 +1,2 @@
-!function(modules){function __webpack_require__(moduleId){if(installedModules[moduleId])return installedModules[moduleId].exports;var module=installedModules[moduleId]={exports:{},id:moduleId,loaded:!1};return modules[moduleId].call(module.exports,module,module.exports,__webpack_require__),module.loaded=!0,module.exports}var installedModules={};return __webpack_require__.m=modules,__webpack_require__.c=installedModules,__webpack_require__.p="",__webpack_require__(0)}([function(module,exports){"use strict";function formatColumn(column,cell,rowData,rowHeaders){if(loris.hiddenHeaders.indexOf(column)>-1)return null;var row={};if(rowHeaders.forEach(function(header,index){row[header]=rowData[index]},this),"Title"===column){var cellLinks=[];return cellLinks.push(React.createElement("a",{href:loris.BaseURL+"/issue_tracker/issue/?issueID="+row["Issue ID"]+"&backURL"},row.Title)),React.createElement("td",null,cellLinks)}if("Issue ID"===column){var _cellLinks=[];return _cellLinks.push(React.createElement("a",{href:loris.BaseURL+"/issue_tracker/issue/?issueID="+row["Issue ID"]+"&backURL"},cell)),React.createElement("td",null,_cellLinks)}if("Priority"===column)switch(cell){case"normal":return React.createElement("td",{style:{background:"#CCFFCC"}},"Normal");case"high":return React.createElement("td",{style:{background:"#EEEEAA"}},"High");case"urgent":return React.createElement("td",{style:{background:"#CC6600"}},"Urgent");case"immediate":return React.createElement("td",{style:{background:"#E4A09E"}},"Immediate");case"low":return React.createElement("td",{style:{background:"#99CCFF"}},"Low");default:return React.createElement("td",null,"None")}if("PSCID"===column&&null!==row.PSCID){var _cellLinks2=[];return _cellLinks2.push(React.createElement("a",{href:loris.BaseURL+"/"+row.CandID+"/"},cell)),React.createElement("td",null,_cellLinks2)}if("Visit Label"===column&&null!==row["Visit Label"]){var _cellLinks3=[];return _cellLinks3.push(React.createElement("a",{href:loris.BaseURL+"/instrument_list/?candID="+row.CandID+"&sessionID="+row.SessionID},cell)),React.createElement("td",null,_cellLinks3)}return React.createElement("td",null,cell)}Object.defineProperty(exports,"__esModule",{value:!0}),window.formatColumn=formatColumn,exports.default=formatColumn}]);
+!function(modules){function __webpack_require__(moduleId){if(installedModules[moduleId])return installedModules[moduleId].exports;var module=installedModules[moduleId]={exports:{},id:moduleId,loaded:!1};return modules[moduleId].call(module.exports,module,module.exports,__webpack_require__),module.loaded=!0,module.exports}var installedModules={};return __webpack_require__.m=modules,__webpack_require__.c=installedModules,__webpack_require__.p="",__webpack_require__(0)}([function(module,exports){"use strict";function formatColumn(column,cell,rowData,rowHeaders){if(loris.hiddenHeaders.indexOf(column)>-1)return null;var row={};if(rowHeaders.forEach(function(header,index){row[header]=rowData[index]},this),"Title"===column){var cellLinks=[];return cellLinks.push(React.createElement("a",{href:loris.BaseURL+"/issue_tracker/issue/?issueID="+row["Issue ID"]},row.Title)),React.createElement("td",null,cellLinks)}if("Issue ID"===column){var _cellLinks=[];return _cellLinks.push(React.createElement("a",{href:loris.BaseURL+"/issue_tracker/issue/?issueID="+row["Issue ID"]},cell)),React.createElement("td",null,_cellLinks)}if("Priority"===column)switch(cell){case"normal":return React.createElement("td",{style:{background:"#CCFFCC"}},"Normal");case"high":return React.createElement("td",{style:{background:"#EEEEAA"}},"High");case"urgent":return React.createElement("td",{style:{background:"#CC6600"}},"Urgent");case"immediate":return React.createElement("td",{style:{background:"#E4A09E"}},"Immediate");case"low":return React.createElement("td",{style:{background:"#99CCFF"}},"Low");default:return React.createElement("td",null,"None")}if("PSCID"===column&&null!==row.PSCID){var _cellLinks2=[];return _cellLinks2.push(React.createElement("a",{href:loris.BaseURL+"/"+row.CandID+"/"},cell)),React.createElement("td",null,_cellLinks2)}if("Visit Label"===column&&null!==row["Visit Label"]){var _cellLinks3=[];return _cellLinks3.push(React.createElement("a",{href:loris.BaseURL+"/instrument_list/?candID="+row.CandID+"&sessionID="+row.SessionID},cell)),React.createElement("td",null,_cellLinks3)}return React.createElement("td",null,cell)}Object.defineProperty(exports,"__esModule",{value:!0}),window.formatColumn=formatColumn,exports.default=formatColumn}]);
 //# sourceMappingURL=columnFormatter.js.map
\ No newline at end of file
diff --git a/modules/issue_tracker/js/index.js b/modules/issue_tracker/js/index.js
index d5e8d4083a5..e1ee90eadc7 100644
--- a/modules/issue_tracker/js/index.js
+++ b/modules/issue_tracker/js/index.js
@@ -1,2 +1,2 @@
-!function(modules){function __webpack_require__(moduleId){if(installedModules[moduleId])return installedModules[moduleId].exports;var module=installedModules[moduleId]={exports:{},id:moduleId,loaded:!1};return modules[moduleId].call(module.exports,module,module.exports,__webpack_require__),module.loaded=!0,module.exports}var installedModules={};return __webpack_require__.m=modules,__webpack_require__.c=installedModules,__webpack_require__.p="",__webpack_require__(0)}({0:function(module,exports,__webpack_require__){"use strict";function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}var _IssueForm=__webpack_require__(20),_IssueForm2=_interopRequireDefault(_IssueForm);$(function(){var args=QueryString.get(),issueTracker=React.createElement("div",{className:"page-issue-tracker"},React.createElement(_IssueForm2.default,{Module:"issue_tracker",DataURL:loris.BaseURL+"/issue_tracker/ajax/EditIssue.php?action=getData&issueID="+args.issueID,action:loris.BaseURL+"/issue_tracker/ajax/EditIssue.php?action=edit"}));ReactDOM.render(issueTracker,document.getElementById("lorisworkspace"))})},20:function(module,exports,__webpack_require__){"use strict";function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}Object.defineProperty(exports,"__esModule",{value:!0});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),_CommentList=__webpack_require__(21),_CommentList2=_interopRequireDefault(_CommentList),IssueForm=function(_React$Component){function IssueForm(props){_classCallCheck(this,IssueForm);var _this=_possibleConstructorReturn(this,(IssueForm.__proto__||Object.getPrototypeOf(IssueForm)).call(this,props));return _this.state={Data:[],formData:{},submissionResult:null,errorMessage:null,isLoaded:!1,isNewIssue:!1,issueID:0},_this.getFormData=_this.getFormData.bind(_this),_this.handleSubmit=_this.handleSubmit.bind(_this),_this.setFormData=_this.setFormData.bind(_this),_this.isValidForm=_this.isValidForm.bind(_this),_this.showAlertMessage=_this.showAlertMessage.bind(_this),_this}return _inherits(IssueForm,_React$Component),_createClass(IssueForm,[{key:"componentDidMount",value:function(){this.getFormData()}},{key:"render",value:function(){if(this.state.error)return React.createElement("div",{className:"alert alert-danger text-center"},React.createElement("strong",null,this.state.error));if(!this.state.isLoaded)return React.createElement("button",{className:"btn-info has-spinner"},"Loading",React.createElement("span",{className:"glyphicon glyphicon-refresh glyphicon-refresh-animate"}));var hasEditPermission=this.state.Data.hasEditPermission||this.state.Data.isOwnIssue||this.state.isNewIssue,headerText=void 0,lastUpdateValue=void 0,lastUpdatedByValue=void 0,dateCreated=void 0,submitButtonValue=void 0,commentLabel=void 0,isWatching=this.state.issueData.watching;this.state.isNewIssue?(headerText="Create New Issue",lastUpdateValue="Never!",lastUpdatedByValue="No-one!",dateCreated="Sometime Soon!",submitButtonValue="Submit Issue",commentLabel="Description"):(headerText="Edit Issue #"+this.state.issueData.issueID,lastUpdateValue=this.state.issueData.lastUpdate,lastUpdatedByValue=this.state.issueData.lastUpdatedBy,dateCreated=this.state.issueData.dateCreated,submitButtonValue="Update Issue",commentLabel="New Comment");var commentHistory=this.state.isNewIssue||React.createElement(_CommentList2.default,{commentHistory:this.state.issueData.commentHistory}),header=void 0,description=void 0;return this.state.isNewIssue||(header=React.createElement("div",{className:"row"},React.createElement("div",{className:"col-md-6"},React.createElement(StaticElement,{name:"lastUpdate",label:"Last Update: ",ref:"lastUpdate",text:lastUpdateValue})),React.createElement("div",{className:"col-md-6"},React.createElement(StaticElement,{name:"lastUpdatedBy",label:"Last Updated By: ",ref:"lastUpdatedBy",text:lastUpdatedByValue})),React.createElement("div",{className:"col-md-6"},React.createElement(StaticElement,{name:"dateCreated",label:"Date Created: ",ref:"dateCreated",text:dateCreated})),React.createElement("div",{className:"col-md-6"},React.createElement(StaticElement,{name:"reporter",label:"Reporter: ",ref:"reporter",text:this.state.issueData.reporter}))),description=React.createElement(StaticElement,{name:"description",label:"Description",ref:"description",text:this.state.issueData.desc})),React.createElement("div",null,React.createElement(FormElement,{name:"issueEdit",onSubmit:this.handleSubmit,ref:"form"},React.createElement("h3",null,headerText),header,React.createElement(TextboxElement,{name:"title",label:"Title",onUserInput:this.setFormData,ref:"title",value:this.state.formData.title,disabled:!hasEditPermission,required:!0}),description,React.createElement(SelectElement,{name:"assignee",label:"Assignee",emptyOption:!0,options:this.state.Data.assignees,onUserInput:this.setFormData,ref:"assignee",disabled:!hasEditPermission,value:this.state.formData.assignee,required:!0}),React.createElement(SelectElement,{name:"centerID",label:"Site",emptyOption:!0,options:this.state.Data.sites,onUserInput:this.setFormData,ref:"centerID",disabled:!hasEditPermission,value:this.state.formData.centerID}),React.createElement(SelectElement,{name:"status",label:"Status",emptyOption:!1,options:this.state.Data.statuses,onUserInput:this.setFormData,ref:"status",disabled:!hasEditPermission,value:this.state.formData.status}),React.createElement(SelectElement,{name:"priority",label:"Priority",emptyOption:!1,options:this.state.Data.priorities,onUserInput:this.setFormData,ref:"priority",required:!1,disabled:!hasEditPermission,value:this.state.formData.priority}),React.createElement(SelectElement,{name:"category",label:"Category",emptyOption:!0,options:this.state.Data.categories,onUserInput:this.setFormData,ref:"category",disabled:!hasEditPermission,value:this.state.formData.category}),React.createElement(SelectElement,{name:"module",label:"Module",emptyOption:!0,options:this.state.Data.modules,onUserInput:this.setFormData,ref:"module",disabled:!hasEditPermission,value:this.state.formData.module}),React.createElement(TextboxElement,{name:"PSCID",label:"PSCID",onUserInput:this.setFormData,ref:"PSCID",disabled:!hasEditPermission,value:this.state.formData.PSCID}),React.createElement(TextboxElement,{name:"visitLabel",label:"Visit Label",onUserInput:this.setFormData,ref:"visitLabel",disabled:!hasEditPermission,value:this.state.formData.visitLabel}),React.createElement(SelectElement,{name:"watching",label:"Watching?",emptyOption:!1,options:{No:"No",Yes:"Yes"},onUserInput:this.setFormData,ref:"watching",value:isWatching}),React.createElement(SelectElement,{name:"othersWatching",label:"Add others to watching?",emptyOption:!0,options:this.state.Data.otherWatchers,onUserInput:this.setFormData,ref:"watching",multiple:!0,value:this.state.formData.othersWatching}),React.createElement(TextareaElement,{name:"comment",label:commentLabel,onUserInput:this.setFormData,ref:"comment",value:this.state.formData.comment}),React.createElement(ButtonElement,{label:submitButtonValue})),commentHistory)}},{key:"getFormData",value:function(){$.ajax(this.props.DataURL,{dataType:"json",success:function(data){this.setState({Data:data,isLoaded:!0,issueData:data.issueData,formData:data.issueData,isNewIssue:!data.issueData.issueID})}.bind(this),error:function(err){this.setState({error:"An error occurred when loading the form!\n Error: "+err.status+" ("+err.statusText+")"})}.bind(this)})}},{key:"handleSubmit",value:function(e){if(e.preventDefault(),!this.state.submissionResult||!this.state.isNewIssue){this.setState({submissionResult:"pending"});var myFormData=this.state.formData,formRefs=this.refs,formData=new FormData;if(this.isValidForm(formRefs,myFormData)){for(var key in myFormData)""!==myFormData[key]&&formData.append(key,myFormData[key]);$.ajax({type:"POST",url:this.props.action,data:formData,cache:!1,dataType:"json",contentType:!1,processData:!1,success:function(data){var msgType="success",message=this.state.isNewIssue?"You will be redirected to main page in 2 seconds!":"";this.showAlertMessage(msgType,message),this.setState({submissionResult:"success",issueID:data.issueID})}.bind(this),error:function(err){console.error(err),this.setState({submissionResult:"error"});var msgType="error",message="Failed to submit issue :(";this.showAlertMessage(msgType,message)}.bind(this)})}}}},{key:"setFormData",value:function(formElement,value){var formDataUpdate=this.state.formData;formDataUpdate[formElement]=value,this.setState({formData:formDataUpdate})}},{key:"isValidForm",value:function isValidForm(formRefs,formDataToCheck){var isValidForm=!0,requiredFields={title:null,assignee:null};return Object.keys(requiredFields).map(function(field){formDataToCheck[field]?requiredFields[field]=formDataToCheck[field]:formRefs[field]&&(formRefs[field].props.hasError=!0,isValidForm=!1)}),this.forceUpdate(),isValidForm}},{key:"showAlertMessage",value:function(msgType,message){var type="success",title="Issue updated!",text=message||"",timer=null,confirmation=!0,callback=function(){this.setState({submissionResult:null})};"success"===msgType&&this.state.isNewIssue?(title="Issue created!",timer=2e3,confirmation=!1,callback=function(){this.setState({formData:{},submissionResult:null}),window.location.assign("/issue_tracker")}):"error"===msgType&&(type="error",title="Error!"),swal({title:title,type:type,text:text,timer:timer,allowOutsideClick:!1,allowEscapeKey:!1,showConfirmButton:confirmation},callback.bind(this))}}]),IssueForm}(React.Component);IssueForm.propTypes={DataURL:React.PropTypes.string.isRequired,action:React.PropTypes.string.isRequired},exports.default=IssueForm},21:function(module,exports){"use strict";function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}Object.defineProperty(exports,"__esModule",{value:!0});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),CommentList=function(_React$Component){function CommentList(props){_classCallCheck(this,CommentList);var _this=_possibleConstructorReturn(this,(CommentList.__proto__||Object.getPrototypeOf(CommentList)).call(this,props));return _this.state={collapsed:!0},_this.toggleCollapsed=_this.toggleCollapsed.bind(_this),_this}return _inherits(CommentList,_React$Component),_createClass(CommentList,[{key:"toggleCollapsed",value:function(){this.setState({collapsed:!this.state.collapsed})}},{key:"render",value:function(){var historyText=[],btnCommentsLabel=this.state.collapsed?"Show Comment History":"Hide Comment History",commentHistory=this.props.commentHistory;for(var commentID in commentHistory)if(commentHistory.hasOwnProperty(commentID)){var action=" updated the "+commentHistory[commentID].fieldChanged+" to ";"comment"===commentHistory[commentID].fieldChanged&&(action=" commented "),historyText.push(React.createElement("div",{key:"comment_"+commentID},"[",commentHistory[commentID].dateAdded,"]",React.createElement("b",null," ",commentHistory[commentID].addedBy),action,React.createElement("i",null," ",commentHistory[commentID].newValue)))}return React.createElement("div",null,React.createElement("div",{className:"btn btn-primary",onClick:this.toggleCollapsed,"data-toggle":"collapse","data-target":"#comment-history",style:{margin:"10px 0"}},btnCommentsLabel),React.createElement("div",{id:"comment-history",className:"collapse"},historyText))}}]),CommentList}(React.Component);exports.default=CommentList}});
+!function(modules){function __webpack_require__(moduleId){if(installedModules[moduleId])return installedModules[moduleId].exports;var module=installedModules[moduleId]={exports:{},id:moduleId,loaded:!1};return modules[moduleId].call(module.exports,module,module.exports,__webpack_require__),module.loaded=!0,module.exports}var installedModules={};return __webpack_require__.m=modules,__webpack_require__.c=installedModules,__webpack_require__.p="",__webpack_require__(0)}({0:function(module,exports,__webpack_require__){"use strict";function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}var _IssueForm=__webpack_require__(20),_IssueForm2=_interopRequireDefault(_IssueForm);$(function(){var args=QueryString.get(),issueTracker=React.createElement("div",{className:"page-issue-tracker"},React.createElement(_IssueForm2.default,{Module:"issue_tracker",DataURL:loris.BaseURL+"/issue_tracker/ajax/EditIssue.php?action=getData&issueID="+args.issueID,action:loris.BaseURL+"/issue_tracker/ajax/EditIssue.php?action=edit"}));ReactDOM.render(issueTracker,document.getElementById("lorisworkspace"))})},20:function(module,exports,__webpack_require__){"use strict";function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}Object.defineProperty(exports,"__esModule",{value:!0});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),_CommentList=__webpack_require__(21),_CommentList2=_interopRequireDefault(_CommentList),IssueForm=function(_React$Component){function IssueForm(props){_classCallCheck(this,IssueForm);var _this=_possibleConstructorReturn(this,(IssueForm.__proto__||Object.getPrototypeOf(IssueForm)).call(this,props));return _this.state={Data:[],formData:{},submissionResult:null,errorMessage:null,isLoaded:!1,isNewIssue:!1,issueID:0},_this.getFormData=_this.getFormData.bind(_this),_this.handleSubmit=_this.handleSubmit.bind(_this),_this.setFormData=_this.setFormData.bind(_this),_this.isValidForm=_this.isValidForm.bind(_this),_this.showAlertMessage=_this.showAlertMessage.bind(_this),_this}return _inherits(IssueForm,_React$Component),_createClass(IssueForm,[{key:"componentDidMount",value:function(){this.getFormData()}},{key:"render",value:function(){if(this.state.error)return React.createElement("div",{className:"alert alert-danger text-center"},React.createElement("strong",null,this.state.error));if(!this.state.isLoaded)return React.createElement("button",{className:"btn-info has-spinner"},"Loading",React.createElement("span",{className:"glyphicon glyphicon-refresh glyphicon-refresh-animate"}));var hasEditPermission=this.state.Data.hasEditPermission||this.state.Data.isOwnIssue||this.state.isNewIssue,headerText=void 0,lastUpdateValue=void 0,lastUpdatedByValue=void 0,dateCreated=void 0,submitButtonValue=void 0,commentLabel=void 0,isWatching=this.state.issueData.watching;this.state.isNewIssue?(headerText="Create New Issue",lastUpdateValue="Never!",lastUpdatedByValue="No-one!",dateCreated="Sometime Soon!",submitButtonValue="Submit Issue",commentLabel="Description"):(headerText="Edit Issue #"+this.state.issueData.issueID,lastUpdateValue=this.state.issueData.lastUpdate,lastUpdatedByValue=this.state.issueData.lastUpdatedBy,dateCreated=this.state.issueData.dateCreated,submitButtonValue="Update Issue",commentLabel="New Comment");var commentHistory=this.state.isNewIssue||React.createElement(_CommentList2.default,{commentHistory:this.state.issueData.commentHistory}),header=void 0,description=void 0;return this.state.isNewIssue||(header=React.createElement("div",{className:"row"},React.createElement("div",{className:"col-md-6"},React.createElement(StaticElement,{name:"lastUpdate",label:"Last Update: ",ref:"lastUpdate",text:lastUpdateValue})),React.createElement("div",{className:"col-md-6"},React.createElement(StaticElement,{name:"lastUpdatedBy",label:"Last Updated By: ",ref:"lastUpdatedBy",text:lastUpdatedByValue})),React.createElement("div",{className:"col-md-6"},React.createElement(StaticElement,{name:"dateCreated",label:"Date Created: ",ref:"dateCreated",text:dateCreated})),React.createElement("div",{className:"col-md-6"},React.createElement(StaticElement,{name:"reporter",label:"Reporter: ",ref:"reporter",text:this.state.issueData.reporter}))),description=React.createElement(StaticElement,{name:"description",label:"Description",ref:"description",text:this.state.issueData.desc})),React.createElement("div",null,React.createElement(FormElement,{name:"issueEdit",onSubmit:this.handleSubmit,ref:"form"},React.createElement("h3",null,headerText),header,React.createElement(TextboxElement,{name:"title",label:"Title",onUserInput:this.setFormData,ref:"title",value:this.state.formData.title,disabled:!hasEditPermission,required:!0}),description,React.createElement(SelectElement,{name:"assignee",label:"Assignee",emptyOption:!0,options:this.state.Data.assignees,onUserInput:this.setFormData,ref:"assignee",disabled:!hasEditPermission,value:this.state.formData.assignee,required:!0}),React.createElement(SelectElement,{name:"centerID",label:"Site",emptyOption:!0,options:this.state.Data.sites,onUserInput:this.setFormData,ref:"centerID",disabled:!hasEditPermission,value:this.state.formData.centerID}),React.createElement(SelectElement,{name:"status",label:"Status",emptyOption:!1,options:this.state.Data.statuses,onUserInput:this.setFormData,ref:"status",disabled:!hasEditPermission,value:this.state.formData.status}),React.createElement(SelectElement,{name:"priority",label:"Priority",emptyOption:!1,options:this.state.Data.priorities,onUserInput:this.setFormData,ref:"priority",required:!1,disabled:!hasEditPermission,value:this.state.formData.priority}),React.createElement(SelectElement,{name:"category",label:"Category",emptyOption:!0,options:this.state.Data.categories,onUserInput:this.setFormData,ref:"category",disabled:!hasEditPermission,value:this.state.formData.category}),React.createElement(SelectElement,{name:"module",label:"Module",emptyOption:!0,options:this.state.Data.modules,onUserInput:this.setFormData,ref:"module",disabled:!hasEditPermission,value:this.state.formData.module}),React.createElement(TextboxElement,{name:"PSCID",label:"PSCID",onUserInput:this.setFormData,ref:"PSCID",disabled:!hasEditPermission,value:this.state.formData.PSCID}),React.createElement(TextboxElement,{name:"visitLabel",label:"Visit Label",onUserInput:this.setFormData,ref:"visitLabel",disabled:!hasEditPermission,value:this.state.formData.visitLabel}),React.createElement(SelectElement,{name:"watching",label:"Watching?",emptyOption:!1,options:{No:"No",Yes:"Yes"},onUserInput:this.setFormData,ref:"watching",value:isWatching}),React.createElement(SelectElement,{name:"othersWatching",label:"Add others to watching?",emptyOption:!0,options:this.state.Data.otherWatchers,onUserInput:this.setFormData,ref:"watching",multiple:!0,value:this.state.formData.othersWatching}),React.createElement(TextareaElement,{name:"comment",label:commentLabel,onUserInput:this.setFormData,ref:"comment",value:this.state.formData.comment}),React.createElement(ButtonElement,{label:submitButtonValue})),commentHistory)}},{key:"getFormData",value:function(){$.ajax(this.props.DataURL,{dataType:"json",success:function(data){this.setState({Data:data,isLoaded:!0,issueData:data.issueData,formData:data.issueData,isNewIssue:!data.issueData.issueID})}.bind(this),error:function(err){this.setState({error:"An error occurred when loading the form!\n Error: "+err.status+" ("+err.statusText+")"})}.bind(this)})}},{key:"handleSubmit",value:function(e){if(e.preventDefault(),!this.state.submissionResult||!this.state.isNewIssue){this.setState({submissionResult:"pending"});var myFormData=this.state.formData,formRefs=this.refs,formData=new FormData;if(this.isValidForm(formRefs,myFormData)){for(var key in myFormData)""!==myFormData[key]&&formData.append(key,myFormData[key]);$.ajax({type:"POST",url:this.props.action,data:formData,cache:!1,dataType:"json",contentType:!1,processData:!1,success:function(data){var msgType="success",message=this.state.isNewIssue?"You will be redirected to main page in 2 seconds!":"";this.showAlertMessage(msgType,message),this.setState({submissionResult:"success",issueID:data.issueID})}.bind(this),error:function(err){console.error(err),this.setState({submissionResult:"error"});var msgType="error",message="Failed to submit issue :(";this.showAlertMessage(msgType,message)}.bind(this)})}}}},{key:"setFormData",value:function(formElement,value){var formDataUpdate=this.state.formData;formDataUpdate[formElement]=value,this.setState({formData:formDataUpdate})}},{key:"isValidForm",value:function isValidForm(formRefs,formDataToCheck){var isValidForm=!0,requiredFields={title:null,assignee:null};return Object.keys(requiredFields).map(function(field){formDataToCheck[field]?requiredFields[field]=formDataToCheck[field]:formRefs[field]&&(formRefs[field].props.hasError=!0,isValidForm=!1)}),this.forceUpdate(),isValidForm}},{key:"showAlertMessage",value:function(msgType,message){var type="success",title="Issue updated!",text=message||"",timer=null,confirmation=!0,callback=function(){this.setState({submissionResult:null})};"success"===msgType&&this.state.isNewIssue?(title="Issue created!",timer=2e3,confirmation=!1,callback=function(){this.setState({formData:{},submissionResult:null}),window.location.assign("/issue_tracker")}):"error"===msgType&&(type="error",title="Error!"),swal({title:title,type:type,text:text,timer:timer,allowOutsideClick:!1,allowEscapeKey:!1,showConfirmButton:confirmation},callback.bind(this))}}]),IssueForm}(React.Component);IssueForm.propTypes={DataURL:React.PropTypes.string.isRequired,action:React.PropTypes.string.isRequired},exports.default=IssueForm},21:function(module,exports){"use strict";function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}Object.defineProperty(exports,"__esModule",{value:!0});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),CommentList=function(_React$Component){function CommentList(props){_classCallCheck(this,CommentList);var _this=_possibleConstructorReturn(this,(CommentList.__proto__||Object.getPrototypeOf(CommentList)).call(this,props));return _this.state={collapsed:!0},_this.toggleCollapsed=_this.toggleCollapsed.bind(_this),_this}return _inherits(CommentList,_React$Component),_createClass(CommentList,[{key:"toggleCollapsed",value:function(){this.setState({collapsed:!this.state.collapsed})}},{key:"render",value:function(){var btnCommentsLabel=this.state.collapsed?"Show Comment History":"Hide Comment History",changes=this.props.commentHistory.reduce(function(carry,item){var label=item.dateAdded.concat(" - ",item.addedBy);return carry[label]||(carry[label]={}),carry[label][item.fieldChanged]=item.newValue,carry},{}),history=Object.keys(changes).sort().reverse().map(function(key,i){var textItems=Object.keys(changes[key]).map(function(index,j){return React.createElement("div",{key:j,className:"row"},React.createElement("div",{className:"col-md-2"},React.createElement("div",{className:"col-md-8"},React.createElement("b",null,index)),React.createElement("div",{className:"col-md-4"}," to ")),React.createElement("div",{className:"col-md-10"},React.createElement("i",null,changes[key][index])))},this);return React.createElement("div",{key:i},React.createElement("hr",null),React.createElement("div",{className:"history-item-label"},React.createElement("span",null,key)," updated :"),React.createElement("div",{className:"history-item-changes"},textItems))},this);return React.createElement("div",null,React.createElement("div",{className:"btn btn-primary",onClick:this.toggleCollapsed,"data-toggle":"collapse","data-target":"#comment-history",style:{margin:"10px 0"}},btnCommentsLabel),React.createElement("div",{id:"comment-history",className:"collapse"},history))}}]),CommentList}(React.Component);exports.default=CommentList}});
 //# sourceMappingURL=index.js.map
\ No newline at end of file
diff --git a/modules/issue_tracker/jsx/CommentList.js b/modules/issue_tracker/jsx/CommentList.js
index af8c2778385..7f3b79ae431 100644
--- a/modules/issue_tracker/jsx/CommentList.js
+++ b/modules/issue_tracker/jsx/CommentList.js
@@ -18,28 +18,44 @@ class CommentList extends React.Component {
   }
 
   render() {
-    const historyText = [];
     const btnCommentsLabel = (this.state.collapsed ?
       "Show Comment History" :
       "Hide Comment History");
 
-    const commentHistory = this.props.commentHistory;
-    for (let commentID in commentHistory) {
-      if (commentHistory.hasOwnProperty(commentID)) {
-        let action = " updated the " + commentHistory[commentID].fieldChanged + " to ";
-        if (commentHistory[commentID].fieldChanged === 'comment') {
-          action = " commented ";
-        }
-        historyText.push(
-          <div key={"comment_" + commentID}>
-            [{commentHistory[commentID].dateAdded}]
-            <b> {commentHistory[commentID].addedBy}</b>
-            {action}
-            <i> {commentHistory[commentID].newValue}</i>
+    const changes = this.props.commentHistory.reduce(function(carry, item) {
+      let label = item.dateAdded.concat(" - ", item.addedBy);
+      if (!carry[label]) {
+        carry[label] = {};
+      }
+      carry[label][item.fieldChanged] = item.newValue;
+      return carry;
+    }, {});
+
+    const history = Object.keys(changes).sort().reverse().map(function(key, i) {
+      const textItems = Object.keys(changes[key]).map(function(index, j) {
+        return (
+          <div key={j} className="row">
+            <div className="col-md-2">
+              <div className="col-md-8"><b>{index}</b></div>
+              <div className="col-md-4"> to </div>
+            </div>
+            <div className="col-md-10"><i>{changes[key][index]}</i></div>
           </div>
         );
-      }
-    }
+      }, this);
+
+      return (
+        <div key={i}>
+          <hr/>
+          <div className="history-item-label">
+            <span>{key}</span> updated :
+          </div>
+          <div className="history-item-changes">
+            {textItems}
+          </div>
+        </div>
+      );
+    }, this);
 
     return (
       <div>
@@ -52,7 +68,7 @@ class CommentList extends React.Component {
           {btnCommentsLabel}
         </div>
         <div id="comment-history" className="collapse">
-          {historyText}
+          {history}
         </div>
       </div>
     );
diff --git a/modules/issue_tracker/jsx/columnFormatter.js b/modules/issue_tracker/jsx/columnFormatter.js
index fa37d7b6800..aa31e242405 100644
--- a/modules/issue_tracker/jsx/columnFormatter.js
+++ b/modules/issue_tracker/jsx/columnFormatter.js
@@ -27,7 +27,7 @@ function formatColumn(column, cell, rowData, rowHeaders) {
     let cellLinks = [];
     cellLinks.push(
       <a href={loris.BaseURL + "/issue_tracker/issue/?issueID=" +
-      row['Issue ID'] + "&backURL"}>
+      row['Issue ID']}>
         {row.Title}
       </a>
     );
@@ -42,7 +42,7 @@ function formatColumn(column, cell, rowData, rowHeaders) {
     let cellLinks = [];
     cellLinks.push(
       <a href={loris.BaseURL + "/issue_tracker/issue/?issueID=" +
-      row['Issue ID'] + "&backURL"}>
+      row['Issue ID']}>
         {cell}
       </a>
     );
diff --git a/modules/issue_tracker/php/issue.class.inc b/modules/issue_tracker/php/issue.class.inc
index 5fd41e5b357..4b4973336d8 100644
--- a/modules/issue_tracker/php/issue.class.inc
+++ b/modules/issue_tracker/php/issue.class.inc
@@ -31,8 +31,7 @@ class Issue extends \NDB_Form
     /**
     * Override default behaviour, since the page is loaded from issueIndex.js
     *
-    * @return void
-    * @access public
+    * @return string
     */
     function display()
     {
diff --git a/modules/issue_tracker/php/issue_tracker.class.inc b/modules/issue_tracker/php/issue_tracker.class.inc
index 6508bd49096..8801e792fc5 100644
--- a/modules/issue_tracker/php/issue_tracker.class.inc
+++ b/modules/issue_tracker/php/issue_tracker.class.inc
@@ -284,8 +284,6 @@ WHERE Parent IS NOT NULL ORDER BY Label",
         $this->addBasicDate('minDate', 'Created After', $dateOptions);
         $this->addBasicDate('maxDate', 'Created Before', $dateOptions);
         $this->addCheckbox('watching', 'Watching', array('value' => '1'));
-
-        $this->tpl_data['backURL'] = $_SERVER['REQUEST_URI'];
     }
 
 
@@ -297,7 +295,7 @@ WHERE Parent IS NOT NULL ORDER BY Label",
      * @param string $field        filter field
      * @param string $val          filter value
      *
-     * @return null
+     * @return string
      */
     function _addValidFilters($prepared_key, $field, $val)
     {
@@ -341,7 +339,7 @@ WHERE Parent IS NOT NULL ORDER BY Label",
      *         will be used for the Navigation Links in  the viewSession
      *         page.
      *
-     * @return associative array
+     * @return array
      */
     function toArray()
     {
diff --git a/modules/issue_tracker/php/my_issue_tracker.class.inc b/modules/issue_tracker/php/my_issue_tracker.class.inc
index d730c286f2e..687a755d68f 100644
--- a/modules/issue_tracker/php/my_issue_tracker.class.inc
+++ b/modules/issue_tracker/php/my_issue_tracker.class.inc
@@ -35,7 +35,7 @@ class My_Issue_Tracker extends \NDB_Menu_Filter_Form
      * Set up the variables required by NDB_Menu_Filter class for constructing
      * a query
      *
-     * @return null
+     * @return void
      */
     function _setupVariables()
     {
@@ -271,8 +271,6 @@ WHERE Parent IS NOT NULL ORDER BY Label",
         $this->addBasicDate('minDate', 'Created After', $dateOptions);
         $this->addBasicDate('maxDate', 'Created Before', $dateOptions);
         $this->addCheckbox('watching', 'Watching', array('value' => '1'));
-
-        $this->tpl_data['backURL'] = $_SERVER['REQUEST_URI'];
     }
 
 
@@ -284,7 +282,7 @@ WHERE Parent IS NOT NULL ORDER BY Label",
      * @param string $field        filter field
      * @param string $val          filter value
      *
-     * @return null
+     * @return string
      */
     function _addValidFilters($prepared_key, $field, $val)
     {
@@ -350,7 +348,7 @@ WHERE Parent IS NOT NULL ORDER BY Label",
      *         will be used for the Navigation Links in  the viewSession
      *         page.
      *
-     * @return associative array
+     * @return array
      */
     function toArray()
     {
diff --git a/modules/issue_tracker/php/resolved_issue_tracker.class.inc b/modules/issue_tracker/php/resolved_issue_tracker.class.inc
index a290a12621a..a1a4ca78802 100644
--- a/modules/issue_tracker/php/resolved_issue_tracker.class.inc
+++ b/modules/issue_tracker/php/resolved_issue_tracker.class.inc
@@ -4,7 +4,7 @@
  * This class features the code for the menu portion of the Loris issue
  * tracker.
  *
- * PHP Version 5
+ * PHP Version 7
  *
  * @category   Loris
  * @package    Main
@@ -34,7 +34,7 @@ class Resolved_Issue_Tracker extends \NDB_Menu_Filter_Form
      * Set up the variables required by NDB_Menu_Filter class for constructing
      * a query
      *
-     * @return null
+     * @return void
      */
     function _setupVariables()
     {
@@ -272,8 +272,6 @@ WHERE Parent IS NOT NULL ORDER BY Label ",
         $this->addBasicDate('minDate', 'Created After', $dateOptions);
         $this->addBasicDate('maxDate', 'Created Before', $dateOptions);
         $this->addCheckbox('watching', 'Watching', array('value' => '1'));
-
-        $this->tpl_data['backURL'] = $_SERVER['REQUEST_URI'];
     }
 
 
@@ -285,7 +283,7 @@ WHERE Parent IS NOT NULL ORDER BY Label ",
      * @param string $field        filter field
      * @param string $val          filter value
      *
-     * @return null
+     * @return string
      */
     function _addValidFilters($prepared_key, $field, $val)
     {
@@ -330,7 +328,7 @@ WHERE Parent IS NOT NULL ORDER BY Label ",
      *         will be used for the Navigation Links in  the viewSession
      *         page.
      *
-     * @return associative array
+     * @return array
      */
     function toArray()
     {
diff --git a/modules/issue_tracker/templates/issue_tracker_controlpanel.tpl b/modules/issue_tracker/templates/issue_tracker_controlpanel.tpl
index 88348b1d908..005a3e93a7e 100644
--- a/modules/issue_tracker/templates/issue_tracker_controlpanel.tpl
+++ b/modules/issue_tracker/templates/issue_tracker_controlpanel.tpl
@@ -1,12 +1,13 @@
 <h3>Navigation</h3>
 <ul>
     {if $issue.backURL}
-        <li><a href="{$issue.backURL}">
-                    <span class="text-default">
-                        <span class="glyphicon glyphicon-backward"></span>&nbsp;Back to list
-                    </span>
-            </a>
-        </li>
+    <li>
+        <a href="{$issue.backURL}">
+            <span class="text-default">
+                <span class="glyphicon glyphicon-backward"></span>&nbsp;Back to list
+            </span>
+        </a>
+    </li>
     {/if}
     {if $issue.prevIssue.URL != ''}
     <li>
diff --git a/modules/login/php/passwordexpiry.class.inc b/modules/login/php/passwordexpiry.class.inc
index ea34dcfd04d..e183829e517 100644
--- a/modules/login/php/passwordexpiry.class.inc
+++ b/modules/login/php/passwordexpiry.class.inc
@@ -146,7 +146,7 @@ class PasswordExpiry extends \NDB_Form
      *
      * @param array $values The values that were submitted to the page.
      *
-     * @return none
+     * @return void
      */
     function _process($values)
     {
diff --git a/modules/media/README.md b/modules/media/README.md
index 88caa226c07..644a9b3756f 100644
--- a/modules/media/README.md
+++ b/modules/media/README.md
@@ -1,51 +1,58 @@
-## Media Module
+# Media
 
-### 📄 Overview
+## Purpose
 
-Media module allows users to **upload**, **search** and **edit** media files associated with a specific candidate timepoint in Loris.
-Any kind of data associated with a candidate timepoint can be uploaded through this module: PDFs, videos, recordings, scripts, log files, etc. Files can optionally be associated to a specific instrument form within a given candidate timepoint.
+Media module allows users to **upload**, **search** and **edit** media files 
+associated with a specific candidate timepoint in Loris. Any kind of data 
+associated with a candidate timepoint can be uploaded through this module: 
+PDFs, videos, recordings, scripts, log files, etc. Files can optionally be 
+associated with a specific instrument from within a given candidate timepoint.
 
+## Intended Users
 
->Note: Currently editing functionality only allows editing of certain metadata fields, such as `Comments` and `Date of Administration`.
+The Media module is used by data entry staff to upload candidate and timepoint 
+specific media. The module can also be used by data-monitoring staff ensuring the 
+integrity of the data for each candidate.
 
-### 🔒 Permissions
+## Scope
 
-In order to use the media module the user needs one or both of the following permissions:
+The Media module provides a tool for uploading files to the server and tracking 
+them, once uploaded. Data uploaded must be specific to a candidate and timepoint, 
+and, optionally, an instrument. The *Edit* functionality only allows modification of 
+the date of upload and of comments linked to the upload. The *Delete* functionality 
+only hides the file from the front-end; it does not remove its database entry nor 
+the file on the server.
 
-1. **media_read** - gives user a read-only access to media module (file browsing only)
-2. **media_write** - gives user a write access to media module (upload/delete files and edit metadata)
+Out of scope: media that is not affiliated with a candidate does not belong in Media.
 
->**Note**: superusers have both of the aforementioned permissions by default! 💪
+## Permissions
 
-### :file_folder: Upload path
+In order to use the media module the user needs one or both of the following 
+permissions:
 
-By default, all files are uploaded under `/data/uploads/`.
-*(Note this directory is not created by the Loris install script and should be manually created by the admin.)*
+- `media_read`: gives user a read-only access to media module 
+(file browsing only)
+- `media_write`: gives user a write access to media module 
+(upload/delete files and edit metadata)
 
-The upload path is configurable in `Paths` section of `Configuration` module.
+Media files are displayed if and only if the files were uploaded to a site within 
+the logged in user's own site affiliations.
 
->**Important** 
->
->The upload path must be readable and writable by your web server; either the web server `user` or `group` must have read and write permissions.
->The default group for your web server process is listed below
->```
->Ubuntu: $GROUP$ = www-data
->CentOS: $GROUP$ = apache
->```
->
->To find the `user` of your web server, run `ps aux | grep 'apache' | egrep -v 'grep|Ss' | awk '{ print $1 }' | sort | uniq`
->To find the `group` of your web server, run `ps aux | grep 'apache' | egrep -v 'grep|Ss' | awk '{ print $1 }' | sort | uniq | groups`
+## Configurations
 
->To see if your web server's user or group owns the upload path, run `ls -ld /data/uploads | awk '{ print "user:" $3 ", group:" $4 }'`
+The following configuration is necessary for the media module to function
 
->If neither owns the folder, you should run `sudo chown <unix-user>:<web-server-group> /data/uploads`
->Then, run `chmod 775 /data/uploads`
+- `mediaPath`: determine where files will be uploaded on the server. Files are 
+uploaded directly into the directory specified (no subdirectories are created). 
 
-### 💯 Features
+Creation of the upload directory is not done by the install script automatically and 
+permissions for access to the directory must be set-up manually, either the web 
+server `user` or `group` must have read and write permissions.
 
-1. **Browse** a list of uploaded files and related information
-2. **Edit** metadata about media files (except timepoint related data such as PSCID, Visit Label and Instrument)
-3. **Upload** new files associated to a specific timepoint
-  - PSCID, Visit Label and Site are required fields for all uploaded files
-  - File name should always start with [PSCID]\_[Visit Label]\_[Instrument] corresponding to the selection in the upload form
-4. **Delete** files. Deleting a file hides it from the frontend, but preserves a copy in the database
+## Interactions with LORIS
+
+Media module depends on a session to be already created before any files can be 
+uploaded for it.
+
+Uploaded files are displayed in the browse tab. Each entry has a link to download 
+the file itself and a link to the timepoint the file was uploaded for.
diff --git a/modules/media/ajax/FileUpload.php b/modules/media/ajax/FileUpload.php
index ead99197256..a29213932be 100644
--- a/modules/media/ajax/FileUpload.php
+++ b/modules/media/ajax/FileUpload.php
@@ -106,6 +106,7 @@ function uploadFile()
     $site       = isset($_POST['forSite']) ? $_POST['forSite'] : null;
     $dateTaken  = isset($_POST['dateTaken']) ? $_POST['dateTaken'] : null;
     $comments   = isset($_POST['comments']) ? $_POST['comments'] : null;
+    $language   = isset($_POST['language']) ? $_POST['language'] : null;
 
     // If required fields are not set, show an error
     if (!isset($_FILES) || !isset($pscid) || !isset($visit) || !isset($site)) {
@@ -155,6 +156,7 @@ function uploadFile()
               'uploaded_by'   => $userID,
               'hide_file'     => 0,
               'date_uploaded' => date("Y-m-d H:i:s"),
+              'language_id'   => $language,
              ];
 
     if (move_uploaded_file($_FILES["file"]["tmp_name"], $mediaPath . $fileName)) {
@@ -201,6 +203,7 @@ function getUploadFields()
     $candIdList      = toSelect($candidates, "CandID", "PSCID");
     $visitList       = Utility::getVisitList();
     $siteList        = Utility::getSiteList(false);
+    $languageList    = Utility::getLanguageList();
 
     // Build array of session data to be used in upload media dropdowns
     $sessionData    = [];
@@ -291,6 +294,7 @@ function getUploadFields()
             "comments, " .
             "file_name as fileName, " .
             "hide_file as hideFile, " .
+            "language_id as language," .
             "m.id FROM media m LEFT JOIN session s ON m.session_id = s.ID " .
             "WHERE m.id = $idMediaFile",
             []
@@ -306,6 +310,7 @@ function getUploadFields()
                'mediaData'   => $mediaData,
                'mediaFiles'  => array_values(getFilesList()),
                'sessionData' => $sessionData,
+               'language'    => $languageList,
               ];
 
     return $result;
diff --git a/modules/media/help/Setup.md b/modules/media/help/Setup.md
new file mode 100644
index 00000000000..603996bf98c
--- /dev/null
+++ b/modules/media/help/Setup.md
@@ -0,0 +1,33 @@
+## Media module set up 
+
+Set the `mediaPath` config value to the desired path on the server where the files 
+will be uploaded.
+
+Create the directory on the server.
+
+The upload path must be readable and writable by your web server; 
+either the web server `user` or `group` must have read and write permissions.
+
+The default group for your web server process is listed below:
+```
+Ubuntu: $GROUP$ = www-data
+CentOS: $GROUP$ = apache
+```
+
+To find the `user` of your web server, run:
+ 
+`ps aux | grep 'apache' | egrep -v 'grep|Ss' | awk '{ print $1 }' | sort | uniq`
+
+To find the `group` of your web server, run:
+
+`ps aux | grep 'apache' | egrep -v 'grep|Ss' | awk '{ print $1 }' | sort | uniq | xargs groups`
+
+To see if your web server's user or group owns the upload path, run:
+ 
+`ls -ld /data/uploads | awk '{ print "user:" $3 ", group:" $4 }'`
+
+If neither owns the folder, you should run the following two commands:
+```
+sudo chown <unix-user>:<web-server-group> /data/uploads
+sudo chmod 775 /data/uploads
+```
diff --git a/modules/media/help/media.md b/modules/media/help/media.md
index dd14d08a4d2..8a2796b81f8 100644
--- a/modules/media/help/media.md
+++ b/modules/media/help/media.md
@@ -1,51 +1,43 @@
-# Media Module
+# Media
 
-## Overview
+The Media module serves as a repository for files associated with a particular 
+candidate-timepoint or instrument in a study.  Users can access and upload files 
+such as PDF scans, recordings, log files, or stimulus presentation media in multiple 
+formats such as .pdf, .mp4, .mp3, .txt, etc. 
 
-Media module allows users to **upload**, **search** and **edit** media files associated with a specific candidate timepoint in Loris.
-Any kind of data associated with a candidate timepoint can be uploaded through this module: PDFs, videos, recordings, scripts, log files, etc. Files can optionally be associated to a specific instrument form within a given candidate timepoint.
+## Searching for a Media File
 
+Under the Browse tab, use the Selection Filters to search for files by fields such 
+as filename, file type, candidate PSCID, Visit Label, Instrument, Site, or 
+name of user who uploaded the file.  Partial string matching can be used on many 
+fields (e.g. filename).  As filters are selected, the data table below will
+dynamically update with relevant results.  Click the “Clear Filters” button to reset 
+all filters. 
 
->Note: Currently editing functionality only allows editing of certain metadata fields, such as `Comments` and `Date of Administration`.
+Within the data table, results can be sorted in ascending or descending order by 
+clicking on any column header. To download a file, click on the filename (in blue 
+text). 
 
-## Permissions
+## Uploading a Media File
 
-In order to use the media module the user needs one or both of the following permissions:
+Under the “Upload” tab, users will be able to upload a new media file. 
+Users must specify information about the file by selecting from a number of dropdown 
+menus including PSCID, Visit Label, Site, Instrument (optional), Date of 
+Administration, and enter comments on the file in the textbox provided. Lastly, 
+users will select the file they wish to upload by clicking the “Browse” button and 
+selecting the file from their computer. To begin the upload, users must click 
+“Upload File”. 
 
-1. **media_read** - gives user a read-only access to media module (file browsing only)
-2. **media_write** - gives user a write access to media module (upload/delete files and edit metadata)
+_Note that a file to be uploaded should follow the naming convention listed at the 
+top of the Upload page: [PSCID]\_[VisitLabel]\_[Instrument]_
 
->**Note**: superusers have both of the aforementioned permissions by default! 
+## Editing a Media File
 
-## :file_folder: Upload path
+Click “Edit” from the “Edit Metadata” column to update or edit certain file 
+properties, via the “Edit Media File” page. 
 
-By default, all files are uploaded under `/data/uploads/`.
-*(Note this directory is not created by the Loris install script and should be manually created by the admin.)*
-
-The upload path is configurable in `Paths` section of `Configuration` module.
-
->**Important** 
->
->The upload path must be readable and writable by your web server; either the web server `user` or `group` must have read and write permissions.
->The default group for your web server process is listed below
->```
->Ubuntu: $GROUP$ = www-data
->CentOS: $GROUP$ = apache
->```
->
->To find the `user` of your web server, run `ps aux | grep 'apache' | egrep -v 'grep|Ss' | awk '{ print $1 }' | sort | uniq`
->To find the `group` of your web server, run `ps aux | grep 'apache' | egrep -v 'grep|Ss' | awk '{ print $1 }' | sort | uniq | groups`
-
->To see if your web server's user or group owns the upload path, run `ls -ld /data/uploads | awk '{ print "user:" $3 ", group:" $4 }'`
-
->If neither owns the folder, you should run `sudo chown <unix-user>:<web-server-group> /data/uploads`
->Then, run `chmod 775 /data/uploads`
-
-## Features
-
-1. **Browse** a list of uploaded files and related information
-2. **Edit** metadata about media files (except timepoint related data such as PSCID, Visit Label and Instrument)
-3. **Upload** new files associated to a specific timepoint
-  - PSCID, Visit Label and Site are required fields for all uploaded files
-  - File name should always start with [PSCID]\_[Visit Label]\_[Instrument] corresponding to the selection in the upload form
-4. **Delete** files. Deleting a file hides it from the frontend, but preserves a copy in the database
\ No newline at end of file
+This page allows users to modify information about an uploaded file.  Fields such 
+as Date of Administration, Comments, and file visibility (hidden or visible) can be 
+updated.  Note that fields such as PSCID, Visit Label, Site, and Instrument cannot 
+be modified on uploaded media files. To finalize an update, users must click “Update 
+File”. 
diff --git a/modules/media/js/mediaIndex.js b/modules/media/js/mediaIndex.js
index 13e305b9a09..6ec624a1083 100644
--- a/modules/media/js/mediaIndex.js
+++ b/modules/media/js/mediaIndex.js
@@ -1,2 +1,3 @@
-!function(modules){function __webpack_require__(moduleId){if(installedModules[moduleId])return installedModules[moduleId].exports;var module=installedModules[moduleId]={exports:{},id:moduleId,loaded:!1};return modules[moduleId].call(module.exports,module,module.exports,__webpack_require__),module.loaded=!0,module.exports}var installedModules={};return __webpack_require__.m=modules,__webpack_require__.c=installedModules,__webpack_require__.p="",__webpack_require__(0)}({0:function(module,exports,__webpack_require__){"use strict";function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),_FilterForm=__webpack_require__(13),_FilterForm2=_interopRequireDefault(_FilterForm),_Tabs=__webpack_require__(9),_uploadForm=__webpack_require__(23),_uploadForm2=_interopRequireDefault(_uploadForm),_columnFormatter=__webpack_require__(24),_columnFormatter2=_interopRequireDefault(_columnFormatter),MediaIndex=function(_React$Component){function MediaIndex(props){_classCallCheck(this,MediaIndex);var _this=_possibleConstructorReturn(this,(MediaIndex.__proto__||Object.getPrototypeOf(MediaIndex)).call(this,props));return loris.hiddenHeaders=["Cand ID","Session ID","Hide File","File Type"],_this.state={isLoaded:!1,filter:{}},_this.fetchData=_this.fetchData.bind(_this),_this.updateFilter=_this.updateFilter.bind(_this),_this.resetFilters=_this.resetFilters.bind(_this),_this}return _inherits(MediaIndex,_React$Component),_createClass(MediaIndex,[{key:"componentDidMount",value:function(){this.fetchData()}},{key:"fetchData",value:function(){$.ajax(this.props.DataURL,{method:"GET",dataType:"json",success:function(data){this.setState({Data:data,isLoaded:!0})}.bind(this),error:function(_error){console.error(_error)}})}},{key:"updateFilter",value:function(filter){this.setState({filter:filter})}},{key:"resetFilters",value:function(){this.refs.mediaFilter.clearFilter()}},{key:"render",value:function(){if(!this.state.isLoaded)return React.createElement("button",{className:"btn-info has-spinner"},"Loading",React.createElement("span",{className:"glyphicon glyphicon-refresh glyphicon-refresh-animate"}));var uploadTab=void 0,tabList=[{id:"browse",label:"Browse"}];return loris.userHasPermission("media_write")&&(tabList.push({id:"upload",label:"Upload"}),uploadTab=React.createElement(_Tabs.TabPane,{TabId:tabList[1].id},React.createElement(_uploadForm2.default,{DataURL:loris.BaseURL+"/media/ajax/FileUpload.php?action=getData",action:loris.BaseURL+"/media/ajax/FileUpload.php?action=upload",maxUploadSize:this.state.Data.maxUploadSize}))),React.createElement(_Tabs.Tabs,{tabs:tabList,defaultTab:"browse",updateURL:!0},React.createElement(_Tabs.TabPane,{TabId:tabList[0].id},React.createElement(_FilterForm2.default,{Module:"media",name:"media_filter",id:"media_filter_form",ref:"mediaFilter",columns:3,formElements:this.state.Data.form,onUpdate:this.updateFilter,filter:this.state.filter},React.createElement("br",null),React.createElement(ButtonElement,{label:"Clear Filters",type:"reset",onUserInput:this.resetFilters})),React.createElement(StaticDataTable,{Data:this.state.Data.Data,Headers:this.state.Data.Headers,Filter:this.state.filter,getFormattedCell:_columnFormatter2.default,freezeColumn:"File Name"})),uploadTab)}}]),MediaIndex}(React.Component);$(function(){var mediaIndex=React.createElement("div",{className:"page-media"},React.createElement(MediaIndex,{DataURL:loris.BaseURL+"/media/?format=json"}));ReactDOM.render(mediaIndex,document.getElementById("lorisworkspace"))})},2:function(module,exports){"use strict";function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}Object.defineProperty(exports,"__esModule",{value:!0});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),Panel=function(_React$Component){function Panel(props){_classCallCheck(this,Panel);var _this=_possibleConstructorReturn(this,(Panel.__proto__||Object.getPrototypeOf(Panel)).call(this,props));return _this.state={collapsed:_this.props.initCollapsed},_this.panelClass=_this.props.initCollapsed?"panel-collapse collapse":"panel-collapse collapse in",_this.toggleCollapsed=_this.toggleCollapsed.bind(_this),_this}return _inherits(Panel,_React$Component),_createClass(Panel,[{key:"toggleCollapsed",value:function(){this.setState({collapsed:!this.state.collapsed})}},{key:"render",value:function(){var glyphClass=this.state.collapsed?"glyphicon pull-right glyphicon-chevron-down":"glyphicon pull-right glyphicon-chevron-up",panelHeading=this.props.title?React.createElement("div",{className:"panel-heading",onClick:this.toggleCollapsed,"data-toggle":"collapse","data-target":"#"+this.props.id,style:{cursor:"pointer"}},this.props.title,React.createElement("span",{className:glyphClass})):"";return React.createElement("div",{className:"panel panel-primary"},panelHeading,React.createElement("div",{id:this.props.id,className:this.panelClass,role:"tabpanel"},React.createElement("div",{className:"panel-body",style:{height:this.props.height}},this.props.children)))}}]),Panel}(React.Component);Panel.propTypes={id:React.PropTypes.string,height:React.PropTypes.string,title:React.PropTypes.string},Panel.defaultProps={initCollapsed:!1,id:"default-panel",height:"100%"},exports.default=Panel},9:function(module,exports){"use strict";function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}Object.defineProperty(exports,"__esModule",{value:!0});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),Tabs=function(_React$Component){function Tabs(props){_classCallCheck(this,Tabs);var _this=_possibleConstructorReturn(this,(Tabs.__proto__||Object.getPrototypeOf(Tabs)).call(this,props)),hash=window.location.hash,activeTab="";return _this.props.updateURL&&hash?activeTab=hash.substr(1):_this.props.defaultTab?activeTab=_this.props.defaultTab:_this.props.tabs.length>0&&(activeTab=_this.props.tabs[0].id),_this.state={activeTab:activeTab},_this.handleClick=_this.handleClick.bind(_this),_this.getTabs=_this.getTabs.bind(_this),_this.getTabPanes=_this.getTabPanes.bind(_this),_this}return _inherits(Tabs,_React$Component),_createClass(Tabs,[{key:"handleClick",value:function(tabId,e){if(this.setState({activeTab:tabId}),this.props.onTabChange(tabId),this.props.updateURL){var scrollDistance=$("body").scrollTop()||$("html").scrollTop();window.location.hash=e.target.hash,$("html,body").scrollTop(scrollDistance)}}},{key:"getTabs",value:function(){var tabs=this.props.tabs.map(function(tab){var tabClass=this.state.activeTab===tab.id?"active":null,href="#"+tab.id,tabID="tab-"+tab.id;return React.createElement("li",{role:"presentation",className:tabClass,key:tab.id},React.createElement("a",{id:tabID,href:href,role:"tab","data-toggle":"tab",onClick:this.handleClick.bind(null,tab.id)},tab.label))}.bind(this));return tabs}},{key:"getTabPanes",value:function(){var tabPanes=React.Children.map(this.props.children,function(child,key){if(child)return React.cloneElement(child,{activeTab:this.state.activeTab,key:key})}.bind(this));return tabPanes}},{key:"render",value:function(){var tabs=this.getTabs(),tabPanes=this.getTabPanes(),tabStyle={marginLeft:0,marginBottom:"5px"};return React.createElement("div",null,React.createElement("ul",{className:"nav nav-tabs",role:"tablist",style:tabStyle},tabs),React.createElement("div",{className:"tab-content"},tabPanes))}}]),Tabs}(React.Component);Tabs.propTypes={tabs:React.PropTypes.array.isRequired,defaultTab:React.PropTypes.string,updateURL:React.PropTypes.bool},Tabs.defaultProps={onTabChange:function(){},updateURL:!1};var TabPane=function(_React$Component2){function TabPane(){return _classCallCheck(this,TabPane),_possibleConstructorReturn(this,(TabPane.__proto__||Object.getPrototypeOf(TabPane)).apply(this,arguments))}return _inherits(TabPane,_React$Component2),_createClass(TabPane,[{key:"render",value:function(){var classList="tab-pane",title=void 0;return this.props.TabId===this.props.activeTab&&(classList+=" active"),this.props.Title&&(title=React.createElement("h1",null,this.props.Title)),React.createElement("div",{role:"tabpanel",className:classList,id:this.props.TabId},title,this.props.children)}}]),TabPane}(React.Component);TabPane.propTypes={TabId:React.PropTypes.string.isRequired,Title:React.PropTypes.string,activeTab:React.PropTypes.string},exports.Tabs=Tabs,exports.TabPane=TabPane},13:function(module,exports,__webpack_require__){"use strict";function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}Object.defineProperty(exports,"__esModule",{value:!0});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),_Panel=__webpack_require__(2),_Panel2=_interopRequireDefault(_Panel),FilterForm=function(_React$Component){function FilterForm(props){_classCallCheck(this,FilterForm);var _this=_possibleConstructorReturn(this,(FilterForm.__proto__||Object.getPrototypeOf(FilterForm)).call(this,props));return _this.clearFilter=_this.clearFilter.bind(_this),_this.getFormChildren=_this.getFormChildren.bind(_this),_this.setFilter=_this.setFilter.bind(_this),_this.onElementUpdate=_this.onElementUpdate.bind(_this),_this.queryString=QueryString.get(),_this}return _inherits(FilterForm,_React$Component),_createClass(FilterForm,[{key:"componentDidMount",value:function(){var filter={},queryString=this.queryString;Object.keys(queryString).forEach(function(key){var filterKey="candidateID"===key?"candID":key;filter[filterKey]={value:queryString[key],exactMatch:!1}}),this.props.onUpdate(filter)}},{key:"clearFilter",value:function(){this.queryString=QueryString.clear(this.props.Module),this.props.onUpdate({})}},{key:"getFormChildren",value:function(){var formChildren=[];return React.Children.forEach(this.props.children,function(child,key){if(React.isValidElement(child)&&"function"==typeof child.type&&child.props.onUserInput){var callbackFunc=child.props.onUserInput,callbackName=callbackFunc.name,elementName=child.type.displayName,queryFieldName="candID"===child.props.name?"candidateID":child.props.name,filterValue=this.queryString[queryFieldName];"onUserInput"===callbackName&&(callbackFunc="ButtonElement"===elementName&&"reset"===child.props.type?this.clearFilter:this.onElementUpdate.bind(null,elementName)),formChildren.push(React.cloneElement(child,{onUserInput:callbackFunc,value:filterValue?filterValue:"",key:key})),this.setFilter(elementName,child.props.name,filterValue)}else formChildren.push(React.cloneElement(child,{key:key}))}.bind(this)),formChildren}},{key:"setFilter",value:function(type,key,value){var filter={};return this.props.filter&&(filter=JSON.parse(JSON.stringify(this.props.filter))),key&&value?(filter[key]={},filter[key].value=value,filter[key].exactMatch="SelectElement"===type):filter&&key&&""===value&&delete filter[key],filter}},{key:"onElementUpdate",value:function(type,fieldName,fieldValue){if("string"==typeof fieldName&&"string"==typeof fieldValue){var queryFieldName="candID"===fieldName?"candidateID":fieldName;this.queryString=QueryString.set(this.queryString,queryFieldName,fieldValue);var filter=this.setFilter(type,fieldName,fieldValue);this.props.onUpdate(filter)}}},{key:"render",value:function(){var formChildren=this.getFormChildren(),formElements=this.props.formElements;return formElements&&Object.keys(formElements).forEach(function(fieldName){var queryFieldName="candID"===fieldName?"candidateID":fieldName;formElements[fieldName].onUserInput=this.onElementUpdate.bind(null,fieldName),formElements[fieldName].value=this.queryString[queryFieldName]}.bind(this)),React.createElement(_Panel2.default,{id:this.props.id,height:this.props.height,title:this.props.title},React.createElement(FormElement,this.props,formChildren))}}]),FilterForm}(React.Component);FilterForm.defaultProps={id:"selection-filter",height:"100%",title:"Selection Filter",onUpdate:function(){console.warn("onUpdate() callback is not set!")}},FilterForm.propTypes={Module:React.PropTypes.string.isRequired,filter:React.PropTypes.object.isRequired,id:React.PropTypes.string,height:React.PropTypes.string,title:React.PropTypes.string,onUpdate:React.PropTypes.func},exports.default=FilterForm},18:function(module,exports){"use strict";function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}Object.defineProperty(exports,"__esModule",{value:!0});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),ProgressBar=function(_React$Component){function ProgressBar(){return _classCallCheck(this,ProgressBar),_possibleConstructorReturn(this,(ProgressBar.__proto__||Object.getPrototypeOf(ProgressBar)).apply(this,arguments))}return _inherits(ProgressBar,_React$Component),_createClass(ProgressBar,[{key:"render",value:function(){var progressStyle={display:this.props.value<0?"none":"block",backgroundColor:"#d3d3d3",height:"30px",position:"relative"},labelStyle={position:"absolute",top:0,left:0,zIndex:1e3,width:"100%",color:"#fff",textAlign:"center",lineHeight:"30px",fontWeight:"600"};return React.createElement("div",{className:"progress",style:progressStyle},React.createElement("div",{className:"progress-bar progress-bar-striped active",role:"progressbar","aria-valuemin":"0","aria-valuemax":"100","aria-valuenow":this.props.value,style:{width:this.props.value+"%"}}),React.createElement("span",{style:labelStyle},this.props.value,"%"))}}]),ProgressBar}(React.Component);ProgressBar.propTypes={value:React.PropTypes.number},ProgressBar.defaultProps={value:0},exports.default=ProgressBar},23:function(module,exports,__webpack_require__){"use strict";function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}Object.defineProperty(exports,"__esModule",{value:!0});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),_ProgressBar=__webpack_require__(18),_ProgressBar2=_interopRequireDefault(_ProgressBar),MediaUploadForm=function(_React$Component){function MediaUploadForm(props){_classCallCheck(this,MediaUploadForm);var _this=_possibleConstructorReturn(this,(MediaUploadForm.__proto__||Object.getPrototypeOf(MediaUploadForm)).call(this,props));return _this.state={Data:{},formData:{},uploadResult:null,errorMessage:null,isLoaded:!1,loadedData:0,uploadProgress:-1},_this.getValidFileName=_this.getValidFileName.bind(_this),_this.handleSubmit=_this.handleSubmit.bind(_this),_this.isValidFileName=_this.isValidFileName.bind(_this),_this.isValidForm=_this.isValidForm.bind(_this),_this.setFormData=_this.setFormData.bind(_this),_this.uploadFile=_this.uploadFile.bind(_this),_this}return _inherits(MediaUploadForm,_React$Component),_createClass(MediaUploadForm,[{key:"componentDidMount",value:function(){var self=this;$.ajax(this.props.DataURL,{dataType:"json",success:function(data){self.setState({Data:data,isLoaded:!0})},error:function(data,errorCode,errorMsg){console.error(data,errorCode,errorMsg),self.setState({error:"An error occurred when loading the form!"})}})}},{key:"render",value:function(){if(void 0!==this.state.error)return React.createElement("div",{className:"alert alert-danger text-center"},React.createElement("strong",null,this.state.error));if(!this.state.isLoaded)return React.createElement("button",{className:"btn-info has-spinner"},"Loading",React.createElement("span",{className:"glyphicon glyphicon-refresh glyphicon-refresh-animate"}));var helpText=React.createElement("span",null,"File name must begin with ",React.createElement("b",null,"[PSCID]_[Visit Label]_[Instrument]"),React.createElement("br",null),"For example, for candidate ",React.createElement("i",null,"ABC123"),", visit ",React.createElement("i",null,"V1")," for",React.createElement("i",null,"Body Mass Index")," the file name should be prefixed by:",React.createElement("b",null," ABC123_V1_Body_Mass_Index"),React.createElement("br",null),"File cannot exceed ",this.props.maxUploadSize);return React.createElement("div",{className:"row"},React.createElement("div",{className:"col-md-8 col-lg-7"},React.createElement(FormElement,{name:"mediaUpload",fileUpload:!0,onSubmit:this.handleSubmit,ref:"form"},React.createElement("h3",null,"Upload a media file"),React.createElement("br",null),React.createElement(StaticElement,{label:"Note",text:helpText}),React.createElement(SelectElement,{name:"pscid",label:"PSCID",options:this.state.Data.candidates,onUserInput:this.setFormData,ref:"pscid",hasError:!1,required:!0,value:this.state.formData.pscid}),React.createElement(SelectElement,{name:"visitLabel",label:"Visit Label",options:this.state.Data.visits,onUserInput:this.setFormData,ref:"visitLabel",required:!0,value:this.state.formData.visitLabel}),React.createElement(SelectElement,{name:"forSite",label:"Site",options:this.state.Data.sites,onUserInput:this.setFormData,ref:"forSite",required:!0,value:this.state.formData.forSite}),React.createElement(SelectElement,{name:"instrument",label:"Instrument",options:this.state.Data.instruments,onUserInput:this.setFormData,ref:"instrument",value:this.state.formData.instrument}),React.createElement(DateElement,{name:"dateTaken",label:"Date of Administration",minYear:"2000",maxYear:"2017",onUserInput:this.setFormData,ref:"dateTaken",value:this.state.formData.dateTaken}),React.createElement(TextareaElement,{name:"comments",label:"Comments",onUserInput:this.setFormData,ref:"comments",value:this.state.formData.comments}),React.createElement(FileElement,{name:"file",id:"mediaUploadEl",onUserInput:this.setFormData,ref:"file",label:"File to upload",required:!0,value:this.state.formData.file}),React.createElement(ButtonElement,{label:"Upload File"}),React.createElement("div",{className:"row"},React.createElement("div",{className:"col-sm-9 col-sm-offset-3"},React.createElement(_ProgressBar2.default,{value:this.state.uploadProgress}))))))}},{key:"getValidFileName",value:function(pscid,visitLabel,instrument){var fileName=pscid+"_"+visitLabel;return instrument&&(fileName+="_"+instrument),fileName}},{key:"handleSubmit",value:function(e){e.preventDefault();var formData=this.state.formData,formRefs=this.refs,mediaFiles=this.state.Data.mediaFiles?this.state.Data.mediaFiles:[];if(this.isValidForm(formRefs,formData)){var instrument=formData.instrument?formData.instrument:null,fileName=formData.file?formData.file.name.replace(/\s+/g,"_"):null,requiredFileName=this.getValidFileName(formData.pscid,formData.visitLabel,instrument);if(!this.isValidFileName(requiredFileName,fileName))return void swal("Invalid file name!","File name should begin with: "+requiredFileName,"error");var isDuplicate=mediaFiles.indexOf(fileName);isDuplicate>=0?swal({title:"Are you sure?",text:"A file with this name already exists!\n Would you like to override existing file?",type:"warning",showCancelButton:!0,confirmButtonText:"Yes, I am sure!",cancelButtonText:"No, cancel it!"},function(isConfirm){isConfirm?this.uploadFile():swal("Cancelled","Your imaginary file is safe :)","error")}.bind(this)):this.uploadFile()}}},{key:"uploadFile",value:function(){var formData=this.state.formData,formObj=new FormData;for(var key in formData)""!==formData[key]&&formObj.append(key,formData[key]);$.ajax({type:"POST",url:this.props.action,data:formObj,cache:!1,contentType:!1,processData:!1,xhr:function(){var xhr=new window.XMLHttpRequest;return xhr.upload.addEventListener("progress",function(evt){if(evt.lengthComputable){var percentage=Math.round(evt.loaded/evt.total*100);this.setState({uploadProgress:percentage})}}.bind(this),!1),xhr}.bind(this),success:function(){var mediaFiles=JSON.parse(JSON.stringify(this.state.Data.mediaFiles));mediaFiles.push(formData.file.name);var event=new CustomEvent("update-datatable");window.dispatchEvent(event),this.setState({mediaFiles:mediaFiles,formData:{},uploadProgress:-1}),swal("Upload Successful!","","success")}.bind(this),error:function(err){console.error(err);var msg=err.responseJSON?err.responseJSON.message:"Upload error!";this.setState({errorMessage:msg,uploadProgress:-1}),swal(msg,"","error")}.bind(this)})}},{key:"isValidFileName",value:function(requiredFileName,fileName){return null!==fileName&&null!==requiredFileName&&0===fileName.indexOf(requiredFileName)}},{key:"isValidForm",value:function isValidForm(formRefs,formData){var isValidForm=!0,requiredFields={pscid:null,visitLabel:null,file:null};return Object.keys(requiredFields).map(function(field){formData[field]?requiredFields[field]=formData[field]:formRefs[field]&&(formRefs[field].props.hasError=!0,isValidForm=!1)}),this.forceUpdate(),isValidForm}},{key:"setFormData",value:function(formElement,value){var visitLabel=this.state.formData.visitLabel,pscid=this.state.formData.pscid;"pscid"===formElement&&""!==value&&(this.state.Data.visits=this.state.Data.sessionData[value].visits,this.state.Data.sites=this.state.Data.sessionData[value].sites,visitLabel?this.state.Data.instruments=this.state.Data.sessionData[value].instruments[visitLabel]:this.state.Data.instruments=this.state.Data.sessionData[value].instruments.all),"visitLabel"===formElement&&""!==value&&pscid&&(this.state.Data.instruments=this.state.Data.sessionData[pscid].instruments[value]);var formData=this.state.formData;formData[formElement]=value,this.setState({formData:formData})}}]),MediaUploadForm}(React.Component);MediaUploadForm.propTypes={DataURL:React.PropTypes.string.isRequired,action:React.PropTypes.string.isRequired},exports.default=MediaUploadForm},24:function(module,exports){"use strict";function formatColumn(column,cell,rowData,rowHeaders){if(loris.hiddenHeaders.indexOf(column)>-1)return null;var row={};rowHeaders.forEach(function(header,index){row[header]=rowData[index]},this);var classes=[];"1"===row["Hide File"]&&classes.push("bg-danger"),classes=classes.join(" ");var hasWritePermission=loris.userHasPermission("media_write");if("File Name"===column&&hasWritePermission===!0){var downloadURL=loris.BaseURL+"/media/ajax/FileDownload.php?File="+row["File Name"];return React.createElement("td",{className:classes},React.createElement("a",{href:downloadURL,target:"_blank",download:row["File Name"]},cell))}if("Visit Label"===column&&null!==row["Cand ID"]&&row["Session ID"]){var sessionURL=loris.BaseURL+"/instrument_list/?candID="+row["Cand ID"]+"&sessionID="+row["Session ID"];return React.createElement("td",{className:classes},React.createElement("a",{href:sessionURL},cell))}if("Edit Metadata"===column){var editURL=loris.BaseURL+"/media/edit/?id="+row["Edit Metadata"];return React.createElement("td",{className:classes},React.createElement("a",{href:editURL},"Edit"))}return React.createElement("td",{className:classes},cell)}Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=formatColumn}});
+!function(modules){function __webpack_require__(moduleId){if(installedModules[moduleId])return installedModules[moduleId].exports;var module=installedModules[moduleId]={exports:{},id:moduleId,loaded:!1};return modules[moduleId].call(module.exports,module,module.exports,__webpack_require__),module.loaded=!0,module.exports}var installedModules={};return __webpack_require__.m=modules,__webpack_require__.c=installedModules,__webpack_require__.p="",__webpack_require__(0)}({0:function(module,exports,__webpack_require__){"use strict";function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),_FilterForm=__webpack_require__(13),_FilterForm2=_interopRequireDefault(_FilterForm),_Tabs=__webpack_require__(9),_uploadForm=__webpack_require__(23),_uploadForm2=_interopRequireDefault(_uploadForm),_columnFormatter=__webpack_require__(24),_columnFormatter2=_interopRequireDefault(_columnFormatter),MediaIndex=function(_React$Component){function MediaIndex(props){_classCallCheck(this,MediaIndex);var _this=_possibleConstructorReturn(this,(MediaIndex.__proto__||Object.getPrototypeOf(MediaIndex)).call(this,props));return loris.hiddenHeaders=["Cand ID","Session ID","Hide File","File Type"],_this.state={isLoaded:!1,filter:{}},_this.fetchData=_this.fetchData.bind(_this),_this.updateFilter=_this.updateFilter.bind(_this),_this.resetFilters=_this.resetFilters.bind(_this),_this}return _inherits(MediaIndex,_React$Component),_createClass(MediaIndex,[{key:"componentDidMount",value:function(){this.fetchData()}},{key:"fetchData",value:function(){$.ajax(this.props.DataURL,{method:"GET",dataType:"json",success:function(data){this.setState({Data:data,isLoaded:!0})}.bind(this),error:function(_error){console.error(_error)}})}},{key:"updateFilter",value:function(filter){this.setState({filter:filter})}},{key:"resetFilters",value:function(){this.refs.mediaFilter.clearFilter()}},{key:"render",value:function(){if(!this.state.isLoaded)return React.createElement("button",{className:"btn-info has-spinner"},"Loading",React.createElement("span",{className:"glyphicon glyphicon-refresh glyphicon-refresh-animate"}));var uploadTab=void 0,tabList=[{id:"browse",label:"Browse"}];return loris.userHasPermission("media_write")&&(tabList.push({id:"upload",label:"Upload"}),uploadTab=React.createElement(_Tabs.TabPane,{TabId:tabList[1].id},React.createElement(_uploadForm2.default,{DataURL:loris.BaseURL+"/media/ajax/FileUpload.php?action=getData",action:loris.BaseURL+"/media/ajax/FileUpload.php?action=upload",maxUploadSize:this.state.Data.maxUploadSize}))),React.createElement(_Tabs.Tabs,{tabs:tabList,defaultTab:"browse",updateURL:!0},React.createElement(_Tabs.TabPane,{TabId:tabList[0].id},React.createElement(_FilterForm2.default,{Module:"media",name:"media_filter",id:"media_filter_form",ref:"mediaFilter",columns:3,formElements:this.state.Data.form,onUpdate:this.updateFilter,filter:this.state.filter},React.createElement("br",null),React.createElement(ButtonElement,{label:"Clear Filters",type:"reset",onUserInput:this.resetFilters})),React.createElement(StaticDataTable,{Data:this.state.Data.Data,Headers:this.state.Data.Headers,Filter:this.state.filter,getFormattedCell:_columnFormatter2.default,freezeColumn:"File Name"})),uploadTab)}}]),MediaIndex}(React.Component);$(function(){var mediaIndex=React.createElement("div",{className:"page-media"},React.createElement(MediaIndex,{DataURL:loris.BaseURL+"/media/?format=json"}));ReactDOM.render(mediaIndex,document.getElementById("lorisworkspace"))})},2:function(module,exports){"use strict";function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}Object.defineProperty(exports,"__esModule",{value:!0});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),Panel=function(_React$Component){function Panel(props){_classCallCheck(this,Panel);var _this=_possibleConstructorReturn(this,(Panel.__proto__||Object.getPrototypeOf(Panel)).call(this,props));return _this.state={collapsed:_this.props.initCollapsed},_this.panelClass=_this.props.initCollapsed?"panel-collapse collapse":"panel-collapse collapse in",_this.toggleCollapsed=_this.toggleCollapsed.bind(_this),_this}return _inherits(Panel,_React$Component),_createClass(Panel,[{key:"toggleCollapsed",value:function(){this.setState({collapsed:!this.state.collapsed})}},{key:"render",value:function(){var glyphClass=this.state.collapsed?"glyphicon pull-right glyphicon-chevron-down":"glyphicon pull-right glyphicon-chevron-up",panelHeading=this.props.title?React.createElement("div",{className:"panel-heading",onClick:this.toggleCollapsed,"data-toggle":"collapse","data-target":"#"+this.props.id,style:{cursor:"pointer"}},this.props.title,React.createElement("span",{className:glyphClass})):"";return React.createElement("div",{className:"panel panel-primary"},panelHeading,React.createElement("div",{id:this.props.id,className:this.panelClass,role:"tabpanel"},React.createElement("div",{className:"panel-body",style:{height:this.props.height}},this.props.children)))}}]),Panel}(React.Component);Panel.propTypes={id:React.PropTypes.string,height:React.PropTypes.string,title:React.PropTypes.string},Panel.defaultProps={initCollapsed:!1,id:"default-panel",height:"100%"},exports.default=Panel},9:function(module,exports){"use strict";function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}Object.defineProperty(exports,"__esModule",{value:!0});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),Tabs=function(_React$Component){function Tabs(props){_classCallCheck(this,Tabs);var _this=_possibleConstructorReturn(this,(Tabs.__proto__||Object.getPrototypeOf(Tabs)).call(this,props)),hash=window.location.hash,activeTab="";return _this.props.updateURL&&hash?activeTab=hash.substr(1):_this.props.defaultTab?activeTab=_this.props.defaultTab:_this.props.tabs.length>0&&(activeTab=_this.props.tabs[0].id),_this.state={activeTab:activeTab},_this.handleClick=_this.handleClick.bind(_this),_this.getTabs=_this.getTabs.bind(_this),_this.getTabPanes=_this.getTabPanes.bind(_this),_this}return _inherits(Tabs,_React$Component),_createClass(Tabs,[{key:"handleClick",value:function(tabId,e){if(this.setState({activeTab:tabId}),this.props.onTabChange(tabId),this.props.updateURL){var scrollDistance=$("body").scrollTop()||$("html").scrollTop();window.location.hash=e.target.hash,$("html,body").scrollTop(scrollDistance)}}},{key:"getTabs",value:function(){var tabs=this.props.tabs.map(function(tab){var tabClass=this.state.activeTab===tab.id?"active":null,href="#"+tab.id,tabID="tab-"+tab.id;return React.createElement("li",{role:"presentation",className:tabClass,key:tab.id},React.createElement("a",{id:tabID,href:href,role:"tab","data-toggle":"tab",onClick:this.handleClick.bind(null,tab.id)},tab.label))}.bind(this));return tabs}},{key:"getTabPanes",value:function(){var tabPanes=React.Children.map(this.props.children,function(child,key){if(child)return React.cloneElement(child,{activeTab:this.state.activeTab,key:key})}.bind(this));return tabPanes}},{key:"render",value:function(){var tabs=this.getTabs(),tabPanes=this.getTabPanes(),tabStyle={marginLeft:0,marginBottom:"5px"};return React.createElement("div",null,React.createElement("ul",{className:"nav nav-tabs",role:"tablist",style:tabStyle},tabs),React.createElement("div",{className:"tab-content"},tabPanes))}}]),Tabs}(React.Component);Tabs.propTypes={tabs:React.PropTypes.array.isRequired,defaultTab:React.PropTypes.string,updateURL:React.PropTypes.bool},Tabs.defaultProps={onTabChange:function(){},updateURL:!0};var VerticalTabs=function(_React$Component2){function VerticalTabs(props){_classCallCheck(this,VerticalTabs);var _this2=_possibleConstructorReturn(this,(VerticalTabs.__proto__||Object.getPrototypeOf(VerticalTabs)).call(this,props)),hash=window.location.hash,activeTab="";return _this2.props.updateURL&&hash?activeTab=hash.substr(1):_this2.props.defaultTab?activeTab=_this2.props.defaultTab:_this2.props.tabs.length>0&&(activeTab=_this2.props.tabs[0].id),_this2.state={activeTab:activeTab},_this2.handleClick=_this2.handleClick.bind(_this2),_this2.getTabs=_this2.getTabs.bind(_this2),_this2.getTabPanes=_this2.getTabPanes.bind(_this2),_this2}return _inherits(VerticalTabs,_React$Component2),_createClass(VerticalTabs,[{key:"handleClick",value:function(tabId,e){if(this.setState({activeTab:tabId}),this.props.onTabChange(tabId),this.props.updateURL){var scrollDistance=$("body").scrollTop()||$("html").scrollTop();window.location.hash=e.target.hash,$("html,body").scrollTop(scrollDistance)}}},{key:"getTabs",value:function(){var tabs=this.props.tabs.map(function(tab){var tabClass=this.state.activeTab===tab.id?"active":null,href="#"+tab.id,tabID="tab-"+tab.id;return React.createElement("li",{role:"presentation",className:tabClass,key:tab.id},React.createElement("a",{id:tabID,href:href,role:"tab","data-toggle":"tab",onClick:this.handleClick.bind(null,tab.id)},tab.label))}.bind(this));return tabs}},{key:"getTabPanes",value:function(){var tabPanes=React.Children.map(this.props.children,function(child,key){if(child)return React.cloneElement(child,{activeTab:this.state.activeTab,key:key})}.bind(this));return tabPanes}},{key:"render",value:function(){var tabs=this.getTabs(),tabPanes=this.getTabPanes(),tabStyle={marginLeft:0,marginBottom:"5px"};return React.createElement("div",null,React.createElement("div",{className:"tabbable col-md-3 col-sm-3"},React.createElement("ul",{className:"nav nav-pills nav-stacked",role:"tablist",style:tabStyle},tabs)),React.createElement("div",{className:"tab-content col-md-9 col-sm-9"},tabPanes))}}]),VerticalTabs}(React.Component);VerticalTabs.propTypes={tabs:React.PropTypes.array.isRequired,defaultTab:React.PropTypes.string,updateURL:React.PropTypes.bool},VerticalTabs.defaultProps={onTabChange:function(){},updateURL:!0};var TabPane=function(_React$Component3){function TabPane(){return _classCallCheck(this,TabPane),_possibleConstructorReturn(this,(TabPane.__proto__||Object.getPrototypeOf(TabPane)).apply(this,arguments))}return _inherits(TabPane,_React$Component3),_createClass(TabPane,[{key:"render",value:function(){var classList="tab-pane",title=void 0;return this.props.TabId===this.props.activeTab&&(classList+=" active"),this.props.Title&&(title=React.createElement("h1",null,this.props.Title)),React.createElement("div",{role:"tabpanel",className:classList,id:this.props.TabId},title,this.props.children)}}]),TabPane}(React.Component);TabPane.propTypes={TabId:React.PropTypes.string.isRequired,Title:React.PropTypes.string,activeTab:React.PropTypes.string},exports.Tabs=Tabs,exports.VerticalTabs=VerticalTabs,exports.TabPane=TabPane},13:function(module,exports,__webpack_require__){"use strict";function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}Object.defineProperty(exports,"__esModule",{value:!0});var _typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(obj){return typeof obj}:function(obj){return obj&&"function"==typeof Symbol&&obj.constructor===Symbol&&obj!==Symbol.prototype?"symbol":typeof obj},_createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),_Panel=__webpack_require__(2),_Panel2=_interopRequireDefault(_Panel),FilterForm=function(_React$Component){function FilterForm(props){_classCallCheck(this,FilterForm);var _this=_possibleConstructorReturn(this,(FilterForm.__proto__||Object.getPrototypeOf(FilterForm)).call(this,props));return _this.clearFilter=_this.clearFilter.bind(_this),_this.getFormChildren=_this.getFormChildren.bind(_this),_this.setFilter=_this.setFilter.bind(_this),_this.onElementUpdate=_this.onElementUpdate.bind(_this),_this.queryString=QueryString.get(),_this}return _inherits(FilterForm,_React$Component),_createClass(FilterForm,[{key:"componentDidMount",value:function(){var filter={},queryString=this.queryString;Object.keys(queryString).forEach(function(key){var filterKey="candidateID"===key?"candID":key;filter[filterKey]={value:queryString[key],exactMatch:!1}}),this.props.onUpdate(filter)}},{key:"clearFilter",value:function(){this.queryString=QueryString.clear(this.props.Module),this.props.onUpdate({})}},{key:"getFormChildren",value:function(){var formChildren=[];return React.Children.forEach(this.props.children,function(child,key){if(React.isValidElement(child)&&"function"==typeof child.type&&child.props.onUserInput){var callbackFunc=child.props.onUserInput,callbackName=callbackFunc.name,elementName=child.type.displayName,queryFieldName="candID"===child.props.name?"candidateID":child.props.name,filterValue=this.queryString[queryFieldName];"onUserInput"===callbackName&&(callbackFunc="ButtonElement"===elementName&&"reset"===child.props.type?this.clearFilter:this.onElementUpdate.bind(null,elementName)),formChildren.push(React.cloneElement(child,{onUserInput:callbackFunc,value:filterValue?filterValue:"",key:key})),this.setFilter(elementName,child.props.name,filterValue)}else formChildren.push(React.cloneElement(child,{key:key}))}.bind(this)),formChildren}},{key:"setFilter",value:function(type,key,value){var filter={};return this.props.filter&&(filter=JSON.parse(JSON.stringify(this.props.filter))),key?(filter[key]={},0===value.length?filter[key].value="":key&&value&&(filter[key].value=value),filter[key].exactMatch="SelectElement"===type):filter&&key&&""===value&&delete filter[key],filter}},{key:"onElementUpdate",value:function(type,fieldName,fieldValue){if("string"==typeof fieldName&&("string"==typeof fieldValue||"object"===("undefined"==typeof fieldValue?"undefined":_typeof(fieldValue)))){var queryFieldName="candID"===fieldName?"candidateID":fieldName;this.queryString=QueryString.set(this.queryString,queryFieldName,fieldValue);var filter=this.setFilter(type,fieldName,fieldValue);this.props.onUpdate(filter)}}},{key:"render",value:function(){var formChildren=this.getFormChildren(),formElements=this.props.formElements;return formElements&&Object.keys(formElements).forEach(function(fieldName){var queryFieldName="candID"===fieldName?"candidateID":fieldName;formElements[fieldName].onUserInput=this.onElementUpdate.bind(null,fieldName),formElements[fieldName].value=this.queryString[queryFieldName]}.bind(this)),React.createElement(_Panel2.default,{id:this.props.id,height:this.props.height,title:this.props.title},React.createElement(FormElement,this.props,formChildren))}}]),FilterForm}(React.Component);FilterForm.defaultProps={id:"selection-filter",height:"100%",title:"Selection Filter",onUpdate:function(){console.warn("onUpdate() callback is not set!")}},FilterForm.propTypes={Module:React.PropTypes.string.isRequired,filter:React.PropTypes.object.isRequired,id:React.PropTypes.string,height:React.PropTypes.string,title:React.PropTypes.string,onUpdate:React.PropTypes.func},exports.default=FilterForm},18:function(module,exports){"use strict";function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}Object.defineProperty(exports,"__esModule",{value:!0});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),ProgressBar=function(_React$Component){function ProgressBar(){return _classCallCheck(this,ProgressBar),_possibleConstructorReturn(this,(ProgressBar.__proto__||Object.getPrototypeOf(ProgressBar)).apply(this,arguments))}return _inherits(ProgressBar,_React$Component),_createClass(ProgressBar,[{key:"render",value:function(){var progressStyle={display:this.props.value<0?"none":"block",backgroundColor:"#d3d3d3",height:"30px",position:"relative"},labelStyle={position:"absolute",top:0,left:0,zIndex:1e3,width:"100%",color:"#fff",textAlign:"center",lineHeight:"30px",fontWeight:"600"};return React.createElement("div",{className:"progress",style:progressStyle},React.createElement("div",{className:"progress-bar progress-bar-striped active",role:"progressbar","aria-valuemin":"0","aria-valuemax":"100","aria-valuenow":this.props.value,style:{width:this.props.value+"%"}}),React.createElement("span",{style:labelStyle},this.props.value,"%"))}}]),ProgressBar}(React.Component);ProgressBar.propTypes={value:React.PropTypes.number},ProgressBar.defaultProps={value:0},exports.default=ProgressBar},23:function(module,exports,__webpack_require__){"use strict";function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor))throw new TypeError("Cannot call a class as a function")}function _possibleConstructorReturn(self,call){if(!self)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!call||"object"!=typeof call&&"function"!=typeof call?self:call}function _inherits(subClass,superClass){if("function"!=typeof superClass&&null!==superClass)throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:!1,writable:!0,configurable:!0}}),superClass&&(Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass)}Object.defineProperty(exports,"__esModule",{value:!0});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1,descriptor.configurable=!0,"value"in descriptor&&(descriptor.writable=!0),Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){return protoProps&&defineProperties(Constructor.prototype,protoProps),staticProps&&defineProperties(Constructor,staticProps),Constructor}}(),_ProgressBar=__webpack_require__(18),_ProgressBar2=_interopRequireDefault(_ProgressBar),MediaUploadForm=function(_React$Component){function MediaUploadForm(props){_classCallCheck(this,MediaUploadForm);var _this=_possibleConstructorReturn(this,(MediaUploadForm.__proto__||Object.getPrototypeOf(MediaUploadForm)).call(this,props));return _this.state={Data:{},formData:{},uploadResult:null,errorMessage:null,isLoaded:!1,loadedData:0,uploadProgress:-1},_this.getValidFileName=_this.getValidFileName.bind(_this),_this.handleSubmit=_this.handleSubmit.bind(_this),_this.isValidFileName=_this.isValidFileName.bind(_this),_this.isValidForm=_this.isValidForm.bind(_this),_this.setFormData=_this.setFormData.bind(_this),_this.uploadFile=_this.uploadFile.bind(_this),_this}return _inherits(MediaUploadForm,_React$Component),_createClass(MediaUploadForm,[{key:"componentDidMount",value:function(){var self=this;$.ajax(this.props.DataURL,{dataType:"json",success:function(data){self.setState({Data:data,isLoaded:!0})},error:function(data,errorCode,errorMsg){console.error(data,errorCode,errorMsg),self.setState({error:"An error occurred when loading the form!"})}})}},{key:"render",value:function(){if(void 0!==this.state.error)return React.createElement("div",{className:"alert alert-danger text-center"},React.createElement("strong",null,this.state.error));if(!this.state.isLoaded)return React.createElement("button",{className:"btn-info has-spinner"},"Loading",React.createElement("span",{className:"glyphicon glyphicon-refresh glyphicon-refresh-animate"}));var helpText=React.createElement("span",null,"File name must begin with ",React.createElement("b",null,"[PSCID]_[Visit Label]_[Instrument]"),React.createElement("br",null),"For example, for candidate ",React.createElement("i",null,"ABC123"),", visit ",React.createElement("i",null,"V1")," for",React.createElement("i",null,"Body Mass Index")," the file name should be prefixed by:",React.createElement("b",null," ABC123_V1_Body_Mass_Index"),React.createElement("br",null),"File cannot exceed ",this.props.maxUploadSize);return React.createElement("div",{className:"row"},React.createElement("div",{className:"col-md-8 col-lg-7"},React.createElement(FormElement,{name:"mediaUpload",fileUpload:!0,onSubmit:this.handleSubmit,ref:"form"},React.createElement("h3",null,"Upload a media file"),React.createElement("br",null),React.createElement(StaticElement,{label:"Note",text:helpText}),React.createElement(SelectElement,{name:"pscid",label:"PSCID",options:this.state.Data.candidates,onUserInput:this.setFormData,ref:"pscid",hasError:!1,required:!0,value:this.state.formData.pscid}),React.createElement(SelectElement,{name:"visitLabel",label:"Visit Label",options:this.state.Data.visits,onUserInput:this.setFormData,ref:"visitLabel",required:!0,value:this.state.formData.visitLabel}),React.createElement(SearchableDropdown,{name:"forSite",label:"Site",placeHolder:"Search for site",options:this.state.Data.sites,strictSearch:!0,onUserInput:this.setFormData,ref:"forSite",required:!0,value:this.state.formData.forSite}),React.createElement(SelectElement,{name:"instrument",label:"Instrument",options:this.state.Data.instruments,onUserInput:this.setFormData,ref:"instrument",value:this.state.formData.instrument}),React.createElement(DateElement,{name:"dateTaken",label:"Date of Administration",minYear:"2000",maxYear:"2017",onUserInput:this.setFormData,ref:"dateTaken",value:this.state.formData.dateTaken}),React.createElement(TextareaElement,{name:"comments",label:"Comments",onUserInput:this.setFormData,ref:"comments",value:this.state.formData.comments}),React.createElement(SelectElement,{name:"language",label:"Document's Language",options:this.state.Data.language,onUserInput:this.setFormData,ref:"language",required:!1,value:this.state.formData.language}),React.createElement(FileElement,{name:"file",id:"mediaUploadEl",onUserInput:this.setFormData,ref:"file",label:"File to upload",required:!0,value:this.state.formData.file}),React.createElement(ButtonElement,{label:"Upload File"}),React.createElement("div",{className:"row"},React.createElement("div",{className:"col-sm-9 col-sm-offset-3"},React.createElement(_ProgressBar2.default,{value:this.state.uploadProgress}))))))}},{key:"getValidFileName",value:function(pscid,visitLabel,instrument){var fileName=pscid+"_"+visitLabel;return instrument&&(fileName+="_"+instrument),fileName}},{key:"handleSubmit",value:function(e){e.preventDefault();var formData=this.state.formData,formRefs=this.refs,mediaFiles=this.state.Data.mediaFiles?this.state.Data.mediaFiles:[];if(this.isValidForm(formRefs,formData)){var instrument=formData.instrument?formData.instrument:null,fileName=formData.file?formData.file.name.replace(/\s+/g,"_"):null,requiredFileName=this.getValidFileName(formData.pscid,formData.visitLabel,instrument);if(!this.isValidFileName(requiredFileName,fileName))return void swal("Invalid file name!","File name should begin with: "+requiredFileName,"error");var isDuplicate=mediaFiles.indexOf(fileName);isDuplicate>=0?swal({title:"Are you sure?",text:"A file with this name already exists!\n Would you like to override existing file?",type:"warning",showCancelButton:!0,confirmButtonText:"Yes, I am sure!",cancelButtonText:"No, cancel it!"},function(isConfirm){isConfirm?this.uploadFile():swal("Cancelled","Your imaginary file is safe :)","error")}.bind(this)):this.uploadFile()}}},{key:"uploadFile",value:function(){var formData=this.state.formData,formObj=new FormData;for(var key in formData)""!==formData[key]&&formObj.append(key,formData[key]);$.ajax({type:"POST",url:this.props.action,data:formObj,cache:!1,contentType:!1,processData:!1,xhr:function(){var xhr=new window.XMLHttpRequest;return xhr.upload.addEventListener("progress",function(evt){if(evt.lengthComputable){var percentage=Math.round(evt.loaded/evt.total*100);this.setState({uploadProgress:percentage})}}.bind(this),!1),xhr}.bind(this),success:function(){var mediaFiles=JSON.parse(JSON.stringify(this.state.Data.mediaFiles));mediaFiles.push(formData.file.name);var event=new CustomEvent("update-datatable");window.dispatchEvent(event),this.setState({mediaFiles:mediaFiles,formData:{},uploadProgress:-1}),swal("Upload Successful!","","success")}.bind(this),error:function(err){console.error(err);var msg=err.responseJSON?err.responseJSON.message:"Upload error!";this.setState({errorMessage:msg,uploadProgress:-1}),swal(msg,"","error")}.bind(this)})}},{key:"isValidFileName",value:function(requiredFileName,fileName){return null!==fileName&&null!==requiredFileName&&0===fileName.indexOf(requiredFileName)}},{key:"isValidForm",value:function isValidForm(formRefs,formData){var isValidForm=!0,requiredFields={pscid:null,visitLabel:null,file:null};return Object.keys(requiredFields).map(function(field){formData[field]?requiredFields[field]=formData[field]:formRefs[field]&&(formRefs[field].props.hasError=!0,isValidForm=!1)}),this.forceUpdate(),isValidForm}},{key:"setFormData",value:function(formElement,value){var visitLabel=this.state.formData.visitLabel,pscid=this.state.formData.pscid;"pscid"===formElement&&""!==value&&(this.state.Data.visits=this.state.Data.sessionData[value].visits,this.state.Data.sites=this.state.Data.sessionData[value].sites,visitLabel?this.state.Data.instruments=this.state.Data.sessionData[value].instruments[visitLabel]:this.state.Data.instruments=this.state.Data.sessionData[value].instruments.all),"visitLabel"===formElement&&""!==value&&pscid&&(this.state.Data.instruments=this.state.Data.sessionData[pscid].instruments[value]);var formData=this.state.formData;formData[formElement]=value,this.setState({formData:formData})}}]),MediaUploadForm}(React.Component);MediaUploadForm.propTypes={DataURL:React.PropTypes.string.isRequired,action:React.PropTypes.string.isRequired},exports.default=MediaUploadForm},24:function(module,exports){"use strict";function formatColumn(column,cell,rowData,rowHeaders){if(loris.hiddenHeaders.indexOf(column)>-1)return null;var row={};rowHeaders.forEach(function(header,index){row[header]=rowData[index]},this);var classes=[];"1"===row["Hide File"]&&classes.push("bg-danger"),classes=classes.join(" ");var hasWritePermission=loris.userHasPermission("media_write");if("File Name"===column&&hasWritePermission===!0){var downloadURL=loris.BaseURL+"/media/ajax/FileDownload.php?File="+row["File Name"];return React.createElement("td",{className:classes},React.createElement("a",{href:downloadURL,target:"_blank",download:row["File Name"]},cell))}if("Visit Label"===column&&null!==row["Cand ID"]&&row["Session ID"]){
+var sessionURL=loris.BaseURL+"/instrument_list/?candID="+row["Cand ID"]+"&sessionID="+row["Session ID"];return React.createElement("td",{className:classes},React.createElement("a",{href:sessionURL},cell))}if("Edit Metadata"===column){var editURL=loris.BaseURL+"/media/edit/?id="+row["Edit Metadata"];return React.createElement("td",{className:classes},React.createElement("a",{href:editURL},"Edit"))}return React.createElement("td",{className:classes},cell)}Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=formatColumn}});
 //# sourceMappingURL=mediaIndex.js.map
\ No newline at end of file
diff --git a/modules/media/jsx/uploadForm.js b/modules/media/jsx/uploadForm.js
index 41af9f6c159..71161fb0a2d 100644
--- a/modules/media/jsx/uploadForm.js
+++ b/modules/media/jsx/uploadForm.js
@@ -118,10 +118,12 @@ class MediaUploadForm extends React.Component {
               required={true}
               value={this.state.formData.visitLabel}
             />
-            <SelectElement
+            <SearchableDropdown
               name="forSite"
               label="Site"
+              placeHolder="Search for site"
               options={this.state.Data.sites}
+              strictSearch={true}
               onUserInput={this.setFormData}
               ref="forSite"
               required={true}
@@ -151,6 +153,15 @@ class MediaUploadForm extends React.Component {
               ref="comments"
               value={this.state.formData.comments}
             />
+            <SelectElement
+              name="language"
+              label="Document's Language"
+              options={this.state.Data.language}
+              onUserInput={this.setFormData}
+              ref="language"
+              required={false}
+              value={this.state.formData.language}
+            />
             <FileElement
               name="file"
               id="mediaUploadEl"
diff --git a/modules/media/php/media.class.inc b/modules/media/php/media.class.inc
index a0278811b2b..6f77380110b 100644
--- a/modules/media/php/media.class.inc
+++ b/modules/media/php/media.class.inc
@@ -57,7 +57,7 @@ class Media extends \NDB_Menu_Filter
     /**
      * Create a form to filter media by various criteria
      *
-     * @return bool
+     * @return void
      */
     function setup()
     {
@@ -103,6 +103,13 @@ class Media extends \NDB_Menu_Filter
             $fileTypeList[$filetype['file_type']] = $filetype['file_type'];
         }
 
+        //Language selector
+        $languages    = \Utility::getLanguageList();
+        $languageList = [];
+        foreach ($languages as $language) {
+            $languageList[$language] = $language;
+        }
+
         // Form Elements
         $this->addBasicText('pSCID', 'PSCID', ["size" => 9, "maxlength" => 7]);
         $this->addBasicText('fileName', 'File Name');
@@ -111,6 +118,7 @@ class Media extends \NDB_Menu_Filter
         $this->addSelect('site', 'For Site', $siteList);
         $this->addBasicText('uploadedBy', 'Uploaded By');
         $this->addSelect('instrument', 'Instrument', $instrumentList);
+        $this->addSelect('language', 'Language', $languageList);
 
         // Add hidden files filter is user is admin
         if ($this->hasHidePermission) {
@@ -134,15 +142,17 @@ class Media extends \NDB_Menu_Filter
     /**
      * Build a list of media to display in Data Table
      *
-     * @return bool
+     * @return void
      * @throws \DatabaseException
      */
     function _setupVariables()
     {
         $user =& \User::singleton();
         // the base query
-        $query  = " FROM media m LEFT JOIN session s ON m.session_id = s.ID".
-        " LEFT JOIN candidate c ON c.CandID=s.CandID";
+        $query  = " FROM media m 
+                    LEFT JOIN session s ON m.session_id = s.ID 
+                    LEFT JOIN candidate c ON c.CandID=s.CandID 
+                    LEFT JOIN language l USING (language_id) ";
         $query .= " WHERE 1=1 ";
 
         // set the class variables
@@ -151,6 +161,7 @@ class Media extends \NDB_Menu_Filter
                'm.file_name',
                '(SELECT PSCID from candidate WHERE CandID=s.CandID) as pscid',
                's.Visit_label as visit_label',
+               'l.language_label',
                '(SELECT Full_name FROM test_names WHERE Test_name=m.instrument)',
                '(SELECT name FROM psc WHERE CenterID=s.CenterID) as site',
                'm.uploaded_by',
@@ -181,6 +192,7 @@ class Media extends \NDB_Menu_Filter
                            'File Name',
                            'PSCID',
                            'Visit Label',
+                           'Language',
                            'Instrument',
                            'Site',
                            'Uploaded By',
@@ -204,6 +216,7 @@ class Media extends \NDB_Menu_Filter
                                's.Visit_label',
                                's.CenterID',
                                'm.hide_file',
+                               'l.language_id',
                               ];
         $this->formToFilter = [
                                'pscid'       => 'c.PSCID',
@@ -211,6 +224,7 @@ class Media extends \NDB_Menu_Filter
                                'visit_label' => 's.Visit_label',
                                'for_site'    => 's.CenterID',
                                'hide_file'   => 'm.hide_file',
+                               'language'    => 'l.language_id',
                               ];
         return true;
     }
@@ -219,7 +233,7 @@ class Media extends \NDB_Menu_Filter
      * Converts the results of this menu filter to a JSON format to be retrieved
      * with ?format=json
      *
-     * @return a json encoded string of the headers and data from this table
+     * @return string a json encoded string of the headers and data from this table
      */
     function toJSON()
     {
diff --git a/modules/mri_violations/README.md b/modules/mri_violations/README.md
new file mode 100644
index 00000000000..ae938ba5966
--- /dev/null
+++ b/modules/mri_violations/README.md
@@ -0,0 +1,87 @@
+# MRI violations
+
+## Purpose
+
+The MRI violations module provides a front end to view information
+about scans that were flagged as violations of the imaging protocol
+(which is configurable and set by each study) by the imaging pipeline 
+scripts. 
+
+The violations also serve as prompts to inform 
+scanner technologists that settings need to be adjusted for future 
+scans (i.e. number of slices are being reduced from the protocol), or 
+as a cue that something is wrong (i.e. coil not functioning properly).
+
+## Intended Users
+
+The MRI violations module is primarily used by DCC staff and the MR 
+Imaging Committee who both decide whether a scan should be included 
+in the batch of study scans or, alternatively, if it should be excluded 
+from further analysis. 
+
+## Scope
+
+The MRI violations module shows a summary of the MRI violations
+(one image per row) identified by the imaging pipeline scripts.
+Depending on the type of violation, clicking on the scan's problem
+will redirect the user to pages with more information regarding
+the identified violation. The different types of violation are:
+
+- Could not identify scan type
+- Protocol Violation
+- Candidate Mismatch
+
+Additionally, the violations "Resolution Status" column can be
+updated once the violation has been resolved. Available options
+are:
+
+- **Unresolved**: this indicates this scan still needs to be 
+addressed by the DCC or MRI committee
+- **Reran**: this indicates that this scan will be rerun through 
+the imaging insertion pipeline and inserted
+- **Emailed site/pending**: this indicates that the site has been 
+emailed about this scan, and a resolution or answer is pending 
+(i.e.. mismatched PSCID and DCCID in the naming convention or a visit 
+label that has not yet been created)
+- **Inserted**: this means that the scan has been inserted into 
+the Imaging Browser, and no flag was needed
+- **Rejected**: this means that the scan has been excluded for future 
+analysis and will not be inserted into the Imaging Browser nor 
+available for download from the DQT
+- **Inserted with flag**: this means that the scan has been inserted 
+into the Imaging Browser and a caveat flag was attached - this caveat 
+flag should have either a drop down menu or open text for the person 
+approving the insertion to indicate what the flag is for
+- **Other**: resolutions that don't fit in any of the above categories 
+
+Finally, the `mri_protocol` table can be updated directly from
+the frontend if the user has the permission for it.
+
+## Permissions
+
+The permission `violated_scans_view_allsites` is required to access
+the MRI violated module.
+
+In addition, the permission `violated_scans_edit` allows the user to
+edit the `mri_protocol` table directly from the browser.
+
+## Configurations
+
+The `mri_protocol` and `mri_protocol_checks` tables need to be configured
+with the study MRI protocol in order for the imaging scripts to determine
+whether a scan violates the protocol set by the study.
+
+## Interactions with LORIS
+
+The `mri_protocol_violated_scans`, `mri_violations_log` and
+`MRICandidateErrors` tables used by the MRI violations module must
+be populated before there is any data in the module. The imaging
+`tarchiveLoader` script populates them as part of the imaging pipeline.
+
+**Notes:**
+- `mri_protocol_violated_scans` logs all the scans referring to
+the problem "Could not identify scan type"
+- `mri_violations_log` logs all the scans referring to the problem
+"Protocol Violation"
+- `MRICandidateErrors` logs all the scans referring to the problem
+"Candidate Mismatch"
diff --git a/modules/mri_violations/js/mri_protocol_violations.js b/modules/mri_violations/js/mri_protocol_violations.js
index a1e4ca75899..41036983ac3 100644
--- a/modules/mri_violations/js/mri_protocol_violations.js
+++ b/modules/mri_violations/js/mri_protocol_violations.js
@@ -22,41 +22,52 @@ function save() {
     "use strict";
     var default_value, id, value;
     /**To get the default value**/
-    $('.description').click(function (event) {
+    $('.description').focus(function (event) {
         id = event.target.id;
         default_value = $("#" + id).text();
     });
 
-    $('.description').bind('blur', function (event) {
-        event.stopImmediatePropagation();
-        id = event.target.id;
-        value = $("#" + id).text();
-        $('<div/>').appendTo('body')
-            //.css({background : 'black', opacity: '0.9'})
-            .html("<div id ='asdfsaf'>Are you sure?</div>")
-            .dialog({
-                title: 'Modification',
-                width: 'auto',
-                resizable: false,
-                //dialogClass:'transparent',
-                position: [800, 120],
-                buttons: {
-                    Yes: function () {
-                        $.get(loris.BaseURL + "/mri_violations/ajax/UpdateMRIProtocol.php?field_id=" + id + "&field_value=" + value, function () {});
-                        $(this).dialog("close");
-                    },
-                    close: function () {
-                        $(this).remove();
-                        $("#" + id).text(default_value);
-                    }
-                }
-            });
-    }).keypress(function (e) {
-        if (e.which === 13) { // Determine if the user pressed the enter button
-	    e.preventDefault();
-            $(this).blur();
+    $('.description').keypress(
+      function(event) {
+        if (event.which === 13 || event.keyCode === 13) {
+          event.preventDefault();
+          var id = '#' + event.target.id;
+          $(id).blur();
         }
-    });
+      }
+    );
+
+    $('.description').blur(
+      function(event) {
+          event.stopImmediatePropagation();
+          id = event.target.id;
+          value = $('#'+id).text();
+          if (value !== default_value) {
+            $('.description').attr('contenteditable', false);
+            swal({
+              title: "Are you sure?",
+              text: "Are you sure you want to edit this field?",
+              type: "warning",
+              showCancelButton: true,
+              confirmButtonText: 'Yes, I am sure!',
+              cancelButtonText: "No, cancel it!"
+            }, function(isConfirm) {
+              if (isConfirm) {
+                $.post(
+                  loris.BaseURL + '/mri_violations/ajax/UpdateMRIProtocol.php',
+                  {
+                    field_id: id,
+                    field_value: value
+                  }
+                );
+              } else {
+                $('#' + id).text(default_value);
+              }
+            });
+            $('.description').attr('contenteditable', true);
+          }
+      }
+    );
 }
 
 $(function () {
diff --git a/modules/mri_violations/php/mri_protocol_violations.class.inc b/modules/mri_violations/php/mri_protocol_violations.class.inc
index 0321cd78de8..c4c16c7e442 100644
--- a/modules/mri_violations/php/mri_protocol_violations.class.inc
+++ b/modules/mri_violations/php/mri_protocol_violations.class.inc
@@ -46,7 +46,7 @@ class Mri_Protocol_Violations extends \NDB_Menu_Filter
     /**
      * Set up the class variables and query to generate the menu filter
      *
-     * @return none but as a side-effect modify internal class variables
+     * @return void but as a side-effect modify internal class variables
      */
     function _setupVariables()
     {
@@ -127,7 +127,7 @@ class Mri_Protocol_Violations extends \NDB_Menu_Filter
      * that are common to every type of page. May be overridden by a specific
      * page or specific page type.
      *
-     * @return none
+     * @return void
      */
     function setup()
     {
diff --git a/modules/mri_violations/php/mri_violations.class.inc b/modules/mri_violations/php/mri_violations.class.inc
index 3fd2df7a0b8..05bc2110cf6 100644
--- a/modules/mri_violations/php/mri_violations.class.inc
+++ b/modules/mri_violations/php/mri_violations.class.inc
@@ -43,9 +43,9 @@ class Mri_Violations extends \NDB_Menu_Filter_Form
     /**
      * Process function
      *
-     * @param string $values the value of values
+     * @param array $values the values being processed
      *
-     * @return boolean true if the user is permitted to see violated scans
+     * @return bool true if the user is permitted to see violated scans
      */
     function _process($values)
     {
@@ -154,7 +154,7 @@ class Mri_Violations extends \NDB_Menu_Filter_Form
      * Set up the class and smarty variables to use for the menu filter to
      * generate the proper query for the menu filter
      *
-     * @return none
+     * @return void
      */
     function _setupVariables()
     {
@@ -339,7 +339,6 @@ class Mri_Violations extends \NDB_Menu_Filter_Form
                               );
 
         $this->EqualityFilters[] = 'v.Site';
-        return true;
     }
 
     /**
@@ -347,7 +346,7 @@ class Mri_Violations extends \NDB_Menu_Filter_Form
      * that are common to every type of page. May be overridden by a specific
      * page or specific page type.
      *
-     * @return none
+     * @return void
      */
     function setup()
     {
diff --git a/modules/mri_violations/php/resolved_violations.class.inc b/modules/mri_violations/php/resolved_violations.class.inc
index 2d5a73e14b7..ec3434bfccb 100644
--- a/modules/mri_violations/php/resolved_violations.class.inc
+++ b/modules/mri_violations/php/resolved_violations.class.inc
@@ -42,9 +42,9 @@ class Resolved_Violations extends \NDB_Menu_Filter_Form
     /**
      * Process function
      *
-     * @param string $values the value of values
+     * @param array $values the value of values
      *
-     * @return boolean true if the user is permitted to see violated scans
+     * @return bool true if the user is permitted to see violated scans
      */
     function _process($values)
     {
@@ -143,7 +143,7 @@ class Resolved_Violations extends \NDB_Menu_Filter_Form
      * Set up the class and smarty variables to use for the menu filter to
      * generate the proper query for the menu filter
      *
-     * @return none
+     * @return void
      */
     function _setupVariables()
     {
@@ -316,14 +316,15 @@ class Resolved_Violations extends \NDB_Menu_Filter_Form
                                'v.SeriesUID',
                                'v.Resolved',
                               );
-        return true;
+        return;
     }
+
     /**
      * Does the setup required for this page. By default, sets up elements
      * that are common to every type of page. May be overridden by a specific
      * page or specific page type.
      *
-     * @return none
+     * @return void
      */
     function setup()
     {
diff --git a/modules/new_profile/README.md b/modules/new_profile/README.md
new file mode 100644
index 00000000000..1558efd577f
--- /dev/null
+++ b/modules/new_profile/README.md
@@ -0,0 +1,46 @@
+# New Profile
+
+## Purpose
+
+The new_profile module is intended to allow users to create new
+candidates in a LORIS database.
+
+## Intended Users
+
+It is primarily used by data entry staff to create candidates for
+data entry.
+
+It may also be used by users uploading imaging data to ensure that
+a candidate exists before uploading the image.
+
+## Scope
+
+The new_profile module only creates candidates.
+
+NOT in scope:
+
+The new_profile module does not create timepoints, batteries, or
+anything else related to candidates, only the candidate itself.
+
+## Configurations
+
+- `useEDC`: This config setting determines whether to prompt for
+  the EDC of the candidate being created.
+- `useProject`: This setting determines whether to prompt for the
+  project of the candidate being created.
+- `StartYear`, `EndYear`, `AgeMin`, `AgeMax`: These are used to
+  determine whether the candidate's date of birth is within the
+  range of the study protocol.
+- `PSCID`: This is used to determine whether the PSCID for the new
+  candidate is autogenerated, prompted for, and what the format of
+  the PSCID that is valid for the study is.
+
+## Permissions
+
+The module requires the data_entry permission and at least one site
+for the user creating a candidate.
+
+## Interactions With LORIS
+
+Upon candidate creation, the module includes a link to the
+timepoint_list module for the newly created candidate.
diff --git a/modules/next_stage/README.md b/modules/next_stage/README.md
new file mode 100644
index 00000000000..67bfde2e4e7
--- /dev/null
+++ b/modules/next_stage/README.md
@@ -0,0 +1,52 @@
+# Next Stage
+
+## Purpose
+
+The `next_stage` module provides a method to start the "next stage"
+of a candidate session. The "Stage" of a session goes from Screening
+to Visit to Approval. The Screening and Visit stages may have
+different instruments administered. The `next_stage` module prompts
+for the date of the visit and uses the data it gathers to populate
+the test battery for the Visit stage.
+
+However, note that the Screening stage is mostly historic and poorly
+tested.  Most LORIS studies prefer to have a separate "Screening"
+visit, rather than a screening stage for each visit. The result is
+that the `next_stage` module is mostly used simply to populate the
+test battery for a session.
+
+## Intended Users
+
+The `next_stage` module is used by data entry staff in order to
+start the Visit stage of an instrument.
+
+## Scope
+
+The `next_stage` module only moves the stage of a session from the
+Screening to Visit. The final Approval or Recycling Bin stage is
+reached by sending to DCC (or Recycling Bin) on the `instrument_list`
+page.
+
+## Permissions
+
+The `data_entry` permission is required. The user must also be at
+the same CenterID as the timepoint being accessed.
+
+Access is also denied if the timepoint isn't startable (ie. if it's
+already been started.)
+
+## Configurations
+
+The `test_battery` table must be set up with instruments to be added
+to the `Visit` stage which meets the criteria of the timepoint (ie
+age range, visit, center..) or no tests will be added. This must
+be done before the stage is started.
+
+## Interactions with LORIS
+
+The `next_stage` module links back to the `instrument_list` page
+after a stage is started.
+
+The `next_stage` module inserts the on-site test battery into the
+flag table. It does NOT insert survey instruments, which are inserted
+by the `survey_accounts` module.
diff --git a/modules/reliability/php/reliability.class.inc b/modules/reliability/php/reliability.class.inc
index f2bf052104c..764e24f785f 100644
--- a/modules/reliability/php/reliability.class.inc
+++ b/modules/reliability/php/reliability.class.inc
@@ -58,7 +58,6 @@ class Reliability extends \NDB_Menu_Filter
         }
         return false;
     }
-//@codingStandardsIgnoreEnd
     /**
      * GetSiteID Load
      *
@@ -78,9 +77,8 @@ class Reliability extends \NDB_Menu_Filter
     /**
      * _SetupVariables function
      *
-     * @return string
+     * @return void
      */
-//@codingStandardsIgnoreStart
     function _setupVariables()
     {
         $user =& \User::singleton();
@@ -188,7 +186,7 @@ class Reliability extends \NDB_Menu_Filter
                                'ProjectID'             => 'candidate.ProjectID',
                                     // 'Lock_record' => 'session.Lock_record'
                               );
-        return true;
+        return;
     }
 
     /**
@@ -722,7 +720,7 @@ class Reliability extends \NDB_Menu_Filter
     /**
      * Override toJSON to append a calculated field to the default JSON object
      *
-     * @return a json encoded string of the headers and data from this table
+     * @return string a json encoded string of the headers and data from this table
      */
     function toJSON()
     {
diff --git a/modules/server_processes_manager/README.md b/modules/server_processes_manager/README.md
new file mode 100644
index 00000000000..674350506f7
--- /dev/null
+++ b/modules/server_processes_manager/README.md
@@ -0,0 +1,64 @@
+# Server Processes Manager
+
+## Purpose
+
+The server processes manager module is used to get information about processes that were 
+launched asynchronously by other LORIS modules.
+
+## Intended Users
+
+The LORIS system administrator(s) should be the only user(s) that should have access to 
+this module.
+
+## Scope
+
+This module displays the information relevant to the asynchronous processes
+(currently running or not) launched by other modules. The properties displayed for
+each process are as follows:
+
+- The internal LORIS process ID for the process
+- Pid: the Unix process ID of the command that was launched asynchronously.
+- Type: type of process (only mri_upload is currently implemented).
+- Stdout file: full Unix path of the Output log file on the LORIS server 
+(STDOUT output stream for the process).
+- Stderr file: full Unix path of the Error log file on the LORIS server 
+(STDERR output stream for the process).
+- Exit code file: full Unix path of the file on the LORIS server that will 
+contain the exit code of the process once it finishes.
+- Exit code: Unix exit code for the process. This column will be empty until 
+the process terminates.
+- Userid: the LORIS username of the user that launched the asynchronous process.
+- Start time: time (on the LORIS server) at which the process was started.
+- End time: time (on the LORIS server) at which the process ended. Will be 
+empty until the process finishes.
+- Exit text: summary text describing the process execution result. Will be 
+empty until the process finishes.
+
+By default, all processes (active or not) are displayed on the server processes
+manager page but the page provides a selection filter that can be used to display 
+only specific processes. Filtering can be performed based on the PID, type of 
+process or user ID. Finally, note that upon termination, the temporary files used
+to store the processe's STDOUT, STDERR and exit code are deleted by default. For 
+processes that were launched by the imaging uploader though, these files are deleted
+only if the process terminates successfully (i.e with an exit code equal to 0).
+
+NOT in scope:
+
+The page does not offer the possibility to suspend or stop an active process.
+
+## Permissions
+
+server_processes_manager
+ - This permission allows the user access to the server processes manager
+module and the ability to view the information for all processes.
+
+## Configurations
+
+There are no configuration settings associated to this module.
+
+## Interactions with LORIS
+
+The imaging uploader module is currently the only LORIS module capable of 
+launching an asynchronous process, namely the execution of the MRI processing
+pipeline on a successfully uploaded scan archive. Consequently, the result table
+will only show these type of processes.
diff --git a/modules/server_processes_manager/php/defaultdatabaseprovider.class.inc b/modules/server_processes_manager/php/defaultdatabaseprovider.class.inc
index f991c258f3a..c910a1bea5d 100644
--- a/modules/server_processes_manager/php/defaultdatabaseprovider.class.inc
+++ b/modules/server_processes_manager/php/defaultdatabaseprovider.class.inc
@@ -28,7 +28,7 @@ class DefaultDatabaseProvider implements IDatabaseProvider
     /**
      * Gets access to the database through the Database::singleton() method.
      *
-     * @return Database an instance of the database.
+     * @return \Database an instance of the database.
      * @throws \DatabaseException if connection to the database cannot be established
      */
     public function getDatabase()
diff --git a/modules/server_processes_manager/php/idatabaseprovider.class.inc b/modules/server_processes_manager/php/idatabaseprovider.class.inc
index c8ffa91cc06..0cd5e8714ba 100644
--- a/modules/server_processes_manager/php/idatabaseprovider.class.inc
+++ b/modules/server_processes_manager/php/idatabaseprovider.class.inc
@@ -28,7 +28,7 @@ interface IDatabaseProvider
     /**
       * Gets a database object used to access the database.
       *
-      * @return a database object used to access the database.
+      * @return \Database object used to access the database.
       */
     function getDatabase();
 }
diff --git a/modules/server_processes_manager/php/server_processes_manager.class.inc b/modules/server_processes_manager/php/server_processes_manager.class.inc
index fe77a89c217..52a15824655 100644
--- a/modules/server_processes_manager/php/server_processes_manager.class.inc
+++ b/modules/server_processes_manager/php/server_processes_manager.class.inc
@@ -42,7 +42,7 @@ class Server_Processes_Manager extends \NDB_Menu_Filter
     /**
      * Sets up the filter and result table layout.
      *
-     * @return bool true if the set up is successful, false otherwise.
+     * @return void
      */
     function _setupVariables()
     {
@@ -81,7 +81,7 @@ class Server_Processes_Manager extends \NDB_Menu_Filter
                                'userid' => 'userid',
                               );
 
-        return true;
+        return;
     }
 
 
@@ -90,7 +90,7 @@ class Server_Processes_Manager extends \NDB_Menu_Filter
      * that are common to every type of page. May be overridden by a specific
      * page or specific page type.
      *
-     * @return none
+     * @return void
      */
     function setup()
     {
@@ -100,7 +100,7 @@ class Server_Processes_Manager extends \NDB_Menu_Filter
         $this->addBasicText('type', 'Type:');
         $this->addBasicText('userid', 'UserId:');
 
-        return true;
+        return;
     }
     /**
      * Gathers JS dependecies and merge them with the parent
diff --git a/modules/statistics/README.md b/modules/statistics/README.md
new file mode 100644
index 00000000000..76d962c67ce
--- /dev/null
+++ b/modules/statistics/README.md
@@ -0,0 +1,59 @@
+# Statistics
+
+## Purpose
+
+The statistics module provides a mechanism to provide summary
+descriptive statistics to users of a LORIS instance.
+
+## Intended Users
+
+The module is intended to be used by researchers or PIs looking for
+at-a-glance statistics about the state of their research project.
+
+## Scope
+
+The statistics module only provides descriptive statistics. Scientific
+analysis should be done outside of LORIS on data extracted from the
+`data_query` module using standard scientific tools.
+
+## Permissions
+
+The `data_entry` permission is required in order to access the
+statistics module.
+
+## Configurations
+
+The Statistics module includes a number of tabs for different types
+of statistics. These can be customized by populating the `StatisticsTabs`
+SQL table. Projects intending to customize the module should do so
+by creating a new project/modules module (ie `statistics_projectname`)
+which contain subpages for the tabs they'd like to use and populating
+the `StatisticsTabs` table, rather than modifying the module itself
+(this will make upgrading of LORIS easier).
+
+## Interactions with LORIS
+
+The default tabs provide summary of data from a variety of different
+LORIS modules. In particular, the data entry statistics gather data
+from instruments, and the imaging statistics use data from both the
+files and tarchive tables. The default tabs are described in further
+detail below.
+
+### Demographic Statistics
+
+This tab provides general statistics relating to the number of candidates
+registered in each cohort as well as customizable categories displaying
+statistics relating to candidate demographics. Statistics can be broken
+down by instrument by selecting an instrument from the dropdown menu.
+
+### Behavioural Statistics
+
+This tab provides data entry statistics relating to the number of
+candidates who have completed each instrument per site and timepoint.
+Statistics can be broken down by instrument or participant. DDE
+statistics are also provided.
+
+### MRI Statistics
+
+This tab displays the number of scans inserted per site as well as their
+QC status. Scan completion is arranged by site, cohort, and timepoint.
diff --git a/modules/statistics/php/module.class.inc b/modules/statistics/php/module.class.inc
index 81867df6cc2..b8f2f318c2c 100644
--- a/modules/statistics/php/module.class.inc
+++ b/modules/statistics/php/module.class.inc
@@ -3,7 +3,7 @@
  * This serves as a hint to LORIS that this module is a real module.
  * It does nothing but implement the module class in the module's namespace.
  *
- * PHP Version 5
+ * PHP Version 7
  *
  * @category   Behavioural
  * @package    Main
diff --git a/modules/statistics/php/statistics.class.inc b/modules/statistics/php/statistics.class.inc
index a1a2b5dfc71..243fb3ecb1f 100644
--- a/modules/statistics/php/statistics.class.inc
+++ b/modules/statistics/php/statistics.class.inc
@@ -1,8 +1,8 @@
 <?php
 /**
- * The welcome menu
+ * The module to display study statistics
  *
- * PHP Version 5
+ * PHP Version 7
  *
  * @category Loris
  * @package  Main
@@ -13,9 +13,9 @@
 namespace LORIS\statistics;
 
 /**
- * The welcome menu
+ * The module to display study statistics
  *
- * PHP Version 5
+ * PHP Version 7
  *
  * @category Loris
  * @package  Main
diff --git a/modules/statistics/php/statistics_dd_site.class.inc b/modules/statistics/php/statistics_dd_site.class.inc
index 95583857a3d..0e3900d8328 100644
--- a/modules/statistics/php/statistics_dd_site.class.inc
+++ b/modules/statistics/php/statistics_dd_site.class.inc
@@ -1,8 +1,8 @@
 <?php
 /**
- * The welcome menu
+ * The module to display study statistics
  *
- * PHP Version 5
+ * PHP Version 7
  *
  * @category Loris
  * @package  Main
@@ -13,9 +13,9 @@
 namespace LORIS\statistics;
 
 /**
- * The welcome menu
+ * The module to display study statistics
  *
- * PHP Version 5
+ * PHP Version 7
  *
  * @category Loris
  * @package  Main
@@ -130,7 +130,7 @@ class Statistics_DD_Site extends statistics_site
      * @param string $projectID  the value of projectID
      * @param string $instrument the value of instrument
      *
-     * @return string
+     * @return array
      */
     function _getResults($centerID, $projectID, $instrument)
     {
@@ -150,7 +150,7 @@ class Statistics_DD_Site extends statistics_site
                 AND i.CommentID LIKE 'DDE%' ORDER BY c.PSCID",
             $this->query_vars
         );
-            return $result;
+        return $result;
     }
 
     /**
diff --git a/modules/statistics/php/statistics_mri_site.class.inc b/modules/statistics/php/statistics_mri_site.class.inc
index 3ae5731e846..99e96713308 100644
--- a/modules/statistics/php/statistics_mri_site.class.inc
+++ b/modules/statistics/php/statistics_mri_site.class.inc
@@ -1,8 +1,8 @@
 <?php
 /**
- * The welcome menu
+ * The module to display study statistics
  *
- * PHP Version 5
+ * PHP Version 7
  *
  * @category Loris
  * @package  Main
@@ -13,9 +13,9 @@
 namespace LORIS\statistics;
 
 /**
- * The welcome menu
+ * The module to display study statistics
  *
- * PHP Version 5
+ * PHP Version 7
  *
  * @category Loris
  * @package  Main
@@ -87,7 +87,7 @@ class Statistics_Mri_Site extends Statistics_Site
      * @param string $projectID the value of projectID
      * @param string $issue     the value of issue
      *
-     * @return void
+     * @return array
      */
     function _getResults($centerID, $projectID, $issue)
     {
diff --git a/modules/statistics/php/statistics_site.class.inc b/modules/statistics/php/statistics_site.class.inc
index 46daaae73c2..c49e8f735bc 100644
--- a/modules/statistics/php/statistics_site.class.inc
+++ b/modules/statistics/php/statistics_site.class.inc
@@ -1,8 +1,8 @@
 <?php
 /**
- * The welcome menu
+ * The module to display study statistics
  *
- * PHP Version 5
+ * PHP Version 7
  *
  * @category Loris
  * @package  Main
@@ -13,9 +13,9 @@
 namespace LORIS\statistics;
 
 /**
- * The welcome menu
+ * The module to display study statistics
  *
- * PHP Version 5
+ * PHP Version 7
  *
  * @category Loris
  * @package  Main
@@ -40,6 +40,7 @@ class Statistics_Site extends \NDB_Form
     {
         $user     =& \User::singleton();
         $centerID = htmlspecialchars($_REQUEST['CenterID']);
+        //TODO: Create a permission specific to statistics
         return $user->hasCenterPermission('data_entry', $centerID);
     }
 
@@ -121,7 +122,7 @@ class Statistics_Site extends \NDB_Form
      * @param string $projectID  the value of projectID
      * @param string $instrument the value of instrument
      *
-     * @return void
+     * @return array
      */
     function _getResults($centerID, $projectID, $instrument)
     {
diff --git a/modules/statistics/php/stats_behavioural.class.inc b/modules/statistics/php/stats_behavioural.class.inc
index 7eb713ae863..7cc35e4e347 100644
--- a/modules/statistics/php/stats_behavioural.class.inc
+++ b/modules/statistics/php/stats_behavioural.class.inc
@@ -1,8 +1,8 @@
 <?php
 /**
- * The welcome menu
+ * The module to display study statistics
  *
- * PHP Version 5
+ * PHP Version 7
  *
  * @category Loris
  * @package  Main
@@ -13,9 +13,9 @@
 namespace LORIS\statistics;
 
 /**
- * The welcome menu
+ * The module to display study statistics
  *
- * PHP Version 5
+ * PHP Version 7
  *
  * @category Loris
  * @package  Main
diff --git a/modules/statistics/php/stats_demographic.class.inc b/modules/statistics/php/stats_demographic.class.inc
index 9b446d8d9d3..888dbb968d7 100644
--- a/modules/statistics/php/stats_demographic.class.inc
+++ b/modules/statistics/php/stats_demographic.class.inc
@@ -1,8 +1,8 @@
 <?php
 /**
- * The welcome menu
+ * The module to display study statistics
  *
- * PHP Version 5
+ * PHP Version 7
  *
  * @category Loris
  * @package  Main
@@ -13,9 +13,9 @@
 namespace LORIS\statistics;
 
 /**
- * The welcome menu
+ * The module to display study statistics
  *
- * PHP Version 5
+ * PHP Version 7
  *
  * @category Loris
  * @package  Main
diff --git a/modules/statistics/php/stats_general.class.inc b/modules/statistics/php/stats_general.class.inc
index a5742bf53b9..b19050fd36f 100644
--- a/modules/statistics/php/stats_general.class.inc
+++ b/modules/statistics/php/stats_general.class.inc
@@ -1,8 +1,8 @@
 <?php
 /**
- * The welcome menu
+ * The module to display study statistics
  *
- * PHP Version 5
+ * PHP Version 7
  *
  * @category Loris
  * @package  Main
@@ -13,9 +13,9 @@
 namespace LORIS\statistics;
 
 /**
- * The welcome menu
+ * The module to display study statistics
  *
- * PHP Version 5
+ * PHP Version 7
  *
  * @category Loris
  * @package  Main
diff --git a/modules/statistics/php/stats_mri.class.inc b/modules/statistics/php/stats_mri.class.inc
index cd6b618df9e..a5725f03f09 100644
--- a/modules/statistics/php/stats_mri.class.inc
+++ b/modules/statistics/php/stats_mri.class.inc
@@ -1,8 +1,8 @@
 <?php
 /**
- * The welcome menu
+ * The module to display study statistics
  *
- * PHP Version 5
+ * PHP Version 7
  *
  * @category Loris
  * @package  Main
@@ -13,9 +13,9 @@
 namespace LORIS\statistics;
 
 /**
- * The welcome menu
+ * The module to display study statistics
  *
- * PHP Version 5
+ * PHP Version 7
  *
  * @category Loris
  * @package  Main
diff --git a/modules/statistics/php/stats_reliability.class.inc b/modules/statistics/php/stats_reliability.class.inc
index ccf57d96307..7ecdbf7f87a 100644
--- a/modules/statistics/php/stats_reliability.class.inc
+++ b/modules/statistics/php/stats_reliability.class.inc
@@ -1,8 +1,8 @@
 <?php
 /**
- * The welcome menu
+ * The module to display study statistics
  *
- * PHP Version 5
+ * PHP Version 7
  *
  * @category Loris
  * @package  Main
@@ -16,9 +16,9 @@ require_once __DIR__ . "/../../reliability/php/reliability.class.inc";
 use LORIS\reliability\Reliability as Reliability;
 
 /**
- * The welcome menu
+ * The module to display study statistics
  *
- * PHP Version 5
+ * PHP Version 7
  *
  * @category Loris
  * @package  Main
diff --git a/modules/statistics/templates/form_stats_behavioural.tpl b/modules/statistics/templates/form_stats_behavioural.tpl
index e228d58d913..ccb653e85fd 100644
--- a/modules/statistics/templates/form_stats_behavioural.tpl
+++ b/modules/statistics/templates/form_stats_behavioural.tpl
@@ -48,7 +48,7 @@
             <td class="   pis">Per Instrument Stats</td>
             {foreach from=$Centers item=center key=centername}
                 <td id='{$center.ID}PIS' class="pis" colspan="2">
-                    <a href='{$baseurl}/statistics/statistics_site/?CenterID={$center.NumericID}{if $useProjects == "true"}&ProjectID={$CurrentProject.ID}{/if}' target="_blank">Please Click Here</a>
+                    <a href='{$baseurl}/statistics/statistics_site/?CenterID={$center.NumericID}{if $useProjects == "true"}&ProjectID={$CurrentProject.ID}{/if}' target="_blank">View Details</a>
                 </td>
             {/foreach}
         </tr>
@@ -102,7 +102,7 @@
             <td class=" pis">Per Instrument Stats</td>
             {foreach from=$Centers item=center key=centername}
                 <td id='{$center.ID}DDPIS' class="pis" colspan="2">
-                    <a href='{$baseurl}/statistics/statistics_dd_site/?CenterID={$center.NumericID}{if $useProjects == "true"}&ProjectID={$CurrentProject.ID}{/if}' target="_blank">Please Click Here</a>
+                    <a href='{$baseurl}/statistics/statistics_dd_site/?CenterID={$center.NumericID}{if $useProjects == "true"}&ProjectID={$CurrentProject.ID}{/if}' target="_blank">View Details</a>
                 </td>
             {/foreach}
         </tr>
diff --git a/modules/survey_accounts/README.md b/modules/survey_accounts/README.md
new file mode 100644
index 00000000000..7f3a08d5eb6
--- /dev/null
+++ b/modules/survey_accounts/README.md
@@ -0,0 +1,44 @@
+# Survey Accounts
+
+## Purpose
+
+The survey accounts module is intended to manage the surveys which
+are sent to participants in a study. It is used to generate a survey
+key, and (optionally) automatically send it to the participant, if
+their email address is provided.
+
+## Intended Users
+
+The survey accounts module is primarily used by study coordinators
+in order to generate a survey key to send to participants.
+
+## Scope
+
+The survey accounts module only generates new survey keys. It does
+*not* collect the data for the surveys, which are written as LORIS
+instruments and collected via a different survey.php script in the
+LORIS `htdocs` directory.
+
+## Permissions
+
+Accessing the survey accounts module requires the `user_accounts`
+LORIS permission.
+
+## Configurations
+
+Each survey must be created as a LORIS instrument, and the
+"IsDirectEntry" column in the `test_names` table in MySQL must be
+set to "true" in order for the survey to show the instrument in the
+dropdown for the list of available surveys in the `add_survey` page.
+
+
+## Interactions with LORIS
+
+The module validates that surveys have not already been sent to a
+participant by comparing the test_name against the LORIS `flag`
+table. As a result, surveys should not be inserted into the LORIS
+`test_battery` table or attempting to send a survey will result in
+an error.
+
+The `add_survey` page generates a link to `$LORIS/survey.php?key=....`
+in the email that it sends after generating a new survey key.
diff --git a/modules/survey_accounts/php/addsurvey.class.inc b/modules/survey_accounts/php/addsurvey.class.inc
index 26c045694a2..fe1664e30e1 100644
--- a/modules/survey_accounts/php/addsurvey.class.inc
+++ b/modules/survey_accounts/php/addsurvey.class.inc
@@ -42,7 +42,7 @@ class AddSurvey extends \NDB_Form
     /**
      * Return default values for QuickForm elements on this page
      *
-     * @return associative array of FieldName => Default Value mapping
+     * @return array (associative) of FieldName => Default Value mapping
      */
     function _getDefaults()
     {
diff --git a/modules/survey_accounts/php/survey_accounts.class.inc b/modules/survey_accounts/php/survey_accounts.class.inc
index 72c0cd570f2..2a3317fdfd7 100644
--- a/modules/survey_accounts/php/survey_accounts.class.inc
+++ b/modules/survey_accounts/php/survey_accounts.class.inc
@@ -41,7 +41,7 @@ class Survey_Accounts extends \NDB_Menu_Filter
      * Setup internal class variables which are required by NDB_Meny_Filter
      * for generating the query which the table data is based on
      *
-     * @return none
+     * @return void
      */
     function _setupVariables()
     {
@@ -90,7 +90,7 @@ class Survey_Accounts extends \NDB_Menu_Filter
      * that are common to every type of page. May be overridden by a specific
      * page or specific page type.
      *
-     * @return none
+     * @return void
      */
     function setup()
     {
diff --git a/modules/timepoint_list/php/timepoint_list.class.inc b/modules/timepoint_list/php/timepoint_list.class.inc
index 24e3794616c..74421fe474a 100644
--- a/modules/timepoint_list/php/timepoint_list.class.inc
+++ b/modules/timepoint_list/php/timepoint_list.class.inc
@@ -100,7 +100,7 @@ class Timepoint_List extends \NDB_Menu
     /**
      * Setup function
      *
-     * @return null
+     * @return void
      */
     function setup()
     {
diff --git a/modules/training/README.md b/modules/training/README.md
new file mode 100644
index 00000000000..aaef557762b
--- /dev/null
+++ b/modules/training/README.md
@@ -0,0 +1,117 @@
+# Training Module
+
+## Purpose
+
+The training Module provides a platform to teach examiners how to administer 
+instruments, as well as testing and certifying their ability to do so.
+
+## Intended Users
+
+Only users who are listed as examiners will be able to complete the training. 
+
+## Scope
+
+Each training session can consist of several tabs with the following types of 
+content:
+
+* Text
+* PDF
+* Video
+* Quiz
+
+The training session ends with a multiple choice quiz which allows the user to 
+test their knowledge and become certified to deliver the instrument they were 
+trained upon.
+
+## Permissions
+
+The `training` permission is required to view the module or complete training. 
+Users who are not examiners but still have permission to view the Training 
+Module will be able to see the training content, but will not be able to 
+complete the quiz and become certified. You can edit the examiners through the 
+Examiner Module.
+
+## Configurations
+
+In order to set up training for a given instrument:
+
+1. You must include the instrument in the `CertificationInstruments` section of 
+the config.xml:
+
+   ```xml
+   <Certification>
+       <EnableCertification>1</EnableCertification>
+       <CertificationInstruments>
+           <test value='Example_Instrument'>Example Instrument</test>
+       </CertificationInstruments>
+   </Certification>
+   ```
+   
+   The `value` attribute must match a `Test_name` from the `test_names` table.
+
+2. Set up the tabs for the training session by inserting into the 
+   `certificaion_training` table:
+   
+   You can add as many of these tabs as you would like, however, there there 
+   must be a quiz and it must be the final tab. No tabs prior to the final tab 
+   can be of type `quiz`.
+   
+   * __Text tab:__
+     ```sql
+     INSERT INTO certification_training (TestID, Title, Content, TrainingType, 
+     OrderNumber) VALUES (1, 'Description', '<p>Description of the instrument
+     </p>', 'text', 1);
+     ```
+     The content can be supplied as HTML
+     
+   * __PDF tab:__
+     ```sql
+     INSERT INTO certification_training (TestID, Title, TrainingType, 
+     OrderNumber) VALUES (1, 'Example', 'pdf', 2);
+     ```
+     The PDF document must be placed in the `project/data/training/pdf/` 
+     folder, and must be have the same name as the instrument. For example, if 
+     the `Test_name` for the instrument was `Example_Instrument`, the PDF would
+     be named `Example_Instrument.pdf`
+     
+   * __Video tab:__
+     ```sql
+     INSERT INTO certification_training (TestID, Title, TrainingType, 
+     OrderNumber) VALUES (1, 'Training Video', 'video', 3);
+     ```
+     The video must be MP4 format, and placed in the 
+     `project/data/training/video/` folder, and must be have the same name as 
+     the instrument. For example, if the `Test_name` for the instrument was 
+     `Example_Instrument`, the video would be named `Example_Instrument.mp4`
+     
+   * __Quiz tab:__
+     ```sql
+     INSERT INTO certification_training (TestID, Title, TrainingType, 
+     OrderNumber) VALUES (@testID, 'Quiz', 'quiz', 4);
+     ```
+     Follow the next set of directions to add questions to your quiz.
+     
+3. Add a quiz:
+   * Insert questions into `certification_training_quiz_questions`:
+     ```sql
+     INSERT INTO certification_training_quiz_questions (TestID, Question, 
+     OrderNumber) VALUES (1, 'First quiz question?', 1);
+     ```
+   * Insert answers into `certifcation_training_quiz_answers`:
+     ```sql
+     INSERT INTO certification_training_quiz_answers (QuestionID, Answer, 
+     Correct, OrderNumber) VALUES (1, 'Answer 1', 0, 1);
+     INSERT INTO certification_training_quiz_answers (QuestionID, Answer, 
+     Correct, OrderNumber) VALUES (1, 'Answer 2', 0, 2);
+     INSERT INTO certification_training_quiz_answers (QuestionID, Answer, 
+     Correct, OrderNumber) VALUES (1, 'Answer 3 (Correct)', 1, 3);
+     INSERT INTO certification_training_quiz_answers (QuestionID, Answer, 
+     Correct, OrderNumber) VALUES (1, 'Answer 4', 0, 4);
+     ```
+     One, and only one answer can be the correct answer.
+
+## Interactions with LORIS
+
+Examiners that complete a training session will have a list of all of their 
+instrument administration certifications listed in the Examiner module under 
+the column "Certification".
diff --git a/modules/training/readme.md b/modules/training/readme.md
deleted file mode 100644
index 44cb86317c6..00000000000
--- a/modules/training/readme.md
+++ /dev/null
@@ -1,66 +0,0 @@
-# Training Module
-
-The Training Module provides a platform to teach and certify the administration of instruments.
-
-Each training session can consist of several tabs with the following types of content:
-* Text
-* PDF
-* Video
-* Quiz
-
-The training session ends with a multiple choice quiz which allows the user to test their knowledge and become certified to deliver the instrument they were trained upon.
-
-In order to set up training for a given instrument:
-
-1. You must include the instrument in the `CertificationInstruments` section of the config.xml:
-   ```xml
-   <Certification>
-       <EnableCertification>1</EnableCertification>
-       <CertificationInstruments>
-           <test value='Example_Instrument'>Example Instrument</test>
-       </CertificationInstruments>
-   </Certification>
-   ```
-   
-   The `value` attribute must match a `Test_name` from the `test_names` table.
-2. Set up the tabs for the training session by inserting into the `certificaion_training` table:
-   You can add as many of these tabs as you would like, however, there there must be a quiz and it must be the final tab. No tabs prior to the final tab can be of type `quiz`.
-   * __Text tab:__
-     ```sql
-     INSERT INTO certification_training (TestID, Title, Content, TrainingType, OrderNumber) VALUES (1, 'Description', '<p>Description of the instrument</p>', 'text', 1);
-     ```
-     The content can be supplied as HTML
-     
-   * __PDF tab:__
-     ```sql
-     INSERT INTO certification_training (TestID, Title, TrainingType, OrderNumber) VALUES (1, 'Example', 'pdf', 2);
-     ```
-     The PDF document must be placed in the `project/data/training/pdf/` folder, and must be have the same name as the instrument. For example, if the `Test_name` for the instrument was `Example_Instrument`, the PDF would be named `Example_Instrument.pdf`
-     
-   * __Video tab:__
-     ```sql
-     INSERT INTO certification_training (TestID, Title, TrainingType, OrderNumber) VALUES (1, 'Training Video', 'video', 3);
-     ```
-     The video must be MP4 format, and placed in the `project/data/training/video/` folder, and must be have the same name as the instrument. For example, if the `Test_name` for the instrument was `Example_Instrument`, the video would be named `Example_Instrument.mp4`
-     
-   * __Quiz tab:__
-     ```sql
-     INSERT INTO certification_training (TestID, Title, TrainingType, OrderNumber) VALUES (@testID, 'Quiz', 'quiz', 4);
-     ```
-     Follow the next set of directions to add questions to your quiz.
-     
-3. Add a quiz:
-   * Insert questions into `certification_training_quiz_questions`:
-     ```sql
-     INSERT INTO certification_training_quiz_questions (TestID, Question, OrderNumber) VALUES (1, 'First quiz question?', 1);
-     ```
-   * Insert answers into `certifcation_training_quiz_answers`:
-     ```sql
-     INSERT INTO certification_training_quiz_answers (QuestionID, Answer, Correct, OrderNumber) VALUES (1, 'Answer 1', 0, 1);
-     INSERT INTO certification_training_quiz_answers (QuestionID, Answer, Correct, OrderNumber) VALUES (1, 'Answer 2', 0, 2);
-     INSERT INTO certification_training_quiz_answers (QuestionID, Answer, Correct, OrderNumber) VALUES (1, 'Answer 3 (Correct)', 1, 3);
-     INSERT INTO certification_training_quiz_answers (QuestionID, Answer, Correct, OrderNumber) VALUES (1, 'Answer 4', 0, 4);
-     ```
-     One, and only one answer can be the correct answer.
-
-__Note:__ Only users who are listed as examiners will be able to complete the training. Users who are not examiners but still have permission to view the Training Module will be able to see the training content, but will not be able to complete the quiz and become certified. You can edit the examiners through the Examiner Module.
diff --git a/modules/user_accounts/README.md b/modules/user_accounts/README.md
new file mode 100644
index 00000000000..46f41549654
--- /dev/null
+++ b/modules/user_accounts/README.md
@@ -0,0 +1,54 @@
+# User Accounts
+
+## Purpose
+
+The user accounts module is used to manage the user accounts on the LORIS 
+application. It provides functions to add new users, edit a user account and search
+for specific user sets.
+
+## Intended Users
+
+This module is typically used by site coordinators to manage the access rights to the LORIS
+application at their site. Other users might include the study coordinator and the LORIS system 
+administrator.
+
+## Scope
+
+This module displays information about the user accounts on the LORIS application.
+It allows the modification of a user account (activation/inactivation, change in access 
+permissions, change in email addresses, etc..) and the creation of new user accounts. 
+It also provides a search filter to view specific sets of user accounts.
+
+## Permissions
+
+The user accounts module uses the following permissions. Any one of them 
+is sufficient to have access to the module:
+
+user_accounts
+ - This permission gives the user viewing and editing access to all accounts
+that have at least one affiliated site in common with him/her.
+
+user_account_multisite
+ - This permission gives the user viewing and editing access to all 
+accounts, irrespective of the sites they are affiliated to.
+
+## Configurations
+
+The user accounts module has the following configuration settings that affect its usage:
+
+title
+ - title of the study that will appear in the text of the email sent to a user 
+and/or his/her supervisor when modifying or creating a user account. 
+
+url
+ - url of the LORIS application that will appear in the text of the email sent to a 
+user and/or his/her supervisor when modifying or creating a user account. 
+
+additional_user_info
+ - whether or not to use the additional user profile fields (like Institution, Country, etc...).
+
+## Interactions with LORIS
+
+- Modifications performed on the MyPreferences page will be reflected on 
+the user account page when viewing the edited account.
+
diff --git a/modules/user_accounts/php/edit_user.class.inc b/modules/user_accounts/php/edit_user.class.inc
index 17594362157..9a022177af9 100644
--- a/modules/user_accounts/php/edit_user.class.inc
+++ b/modules/user_accounts/php/edit_user.class.inc
@@ -72,7 +72,7 @@ class Edit_User extends \NDB_Form
     /**
      * Computes the initial values this page will be filled with.
      *
-     * @return the default values for the initial state of this page.
+     * @return array the default values for the initial state of this page.
      */
     function _getDefaults()
     {
@@ -253,131 +253,150 @@ class Edit_User extends \NDB_Form
         unset($values['CenterIDs']);
         // END multi-site UPDATE
         // EXAMINER UPDATE
-        // get all fields that are related to examiners
-        $ex_curr_sites  = array();
-        $ex_prev_sites  = array();
-        $ex_radiologist = 'N';
-        $ex_pending     = 'Y';
-        foreach ($values as $k => $v) {
-            //examiner fields
-            if (preg_match("/^ex_[0-9]+$/", $k)) {
-                //get centerID
-                $parse_key = explode('_', $k);
-                $cid       = $parse_key[1];
-                $ex_curr_sites[$k] = $cid;
-            }
-            if ($k === 'examiner_radiologist') {
-                $ex_radiologist = $v;
-            }
-            if ($k === 'examiner_pending') {
-                $ex_pending = $v;
+        if ($editor->hasPermission('examiner_multisite')) {
+            // get all fields that are related to examiners
+            $ex_curr_sites  = array();
+            $ex_prev_sites  = array();
+            $ex_radiologist = 'N';
+            $ex_pending     = 'Y';
+
+            foreach ($values as $k => $v) {
+                //examiner fields
+                if (preg_match("/^ex_[0-9]+$/", $k)) {
+                    //get centerID
+                    $parse_key = explode('_', $k);
+                    $cid       = $parse_key[1];
+                    $ex_curr_sites[$k] = $cid;
+                }
+                if ($k === 'examiner_radiologist') {
+                    $ex_radiologist = $v;
+                }
+                if ($k === 'examiner_pending') {
+                    $ex_pending = $v;
+                }
             }
-        }
-        // first check if an update is needed then actually do it
-        if (!empty($ex_radiologist)
-            && !empty($ex_pending)
-            && !empty($ex_curr_sites)
-        ) {
-            //modify examiner radiologist to be in the binary format 0-1
-            $ex_radiologist = $ex_radiologist === 'Y' ? 1:0;
-            $examinerID     = $DB->pselectOne(
-                "SELECT e.examinerID
+
+            // first check if an update is needed then actually do it
+            if (!empty($ex_radiologist)
+                && !empty($ex_pending)
+                && !empty($ex_curr_sites)
+            ) {
+                //modify examiner radiologist to be in the binary format 0-1
+                $ex_radiologist = $ex_radiologist === 'Y' ? 1 : 0;
+
+                $examinerID = $DB->pselect(
+                    "SELECT e.examinerID
                  FROM examiners e
                  WHERE e.full_name=:fn",
-                array(
-                 "fn" => $values['Real_name'],
-                )
-            );
-            // If examiner not in table add him,
-            // otherwise update the radiologist field and get the current sites
-            $values = \Utility::nullifyEmpty($values, 'examiner_radiologist');
-            if (empty($examinerID)) {
-                $DB->insert(
-                    'examiners',
                     array(
-                     'full_name'   => $values['Real_name'],
-                     'radiologist' => $ex_radiologist,
-                     'userID'      => $uid,
+                     "fn" => $values['Real_name'],
                     )
                 );
-                $examinerID = $DB->pselectOne(
-                    "SELECT examinerID
+
+                // If examiner not in table add him,
+                // otherwise update the radiologist field and get the current sites
+                $values = \Utility::nullifyEmpty($values, 'examiner_radiologist');
+                if (empty($examinerID)) {
+
+                    $DB->insert(
+                        'examiners',
+                        array(
+                         'full_name'   => $values['Real_name'],
+                         'radiologist' => $ex_radiologist,
+                         'userID'      => $uid,
+                        )
+                    );
+                    $examinerID = $examinerID = $DB->pselectOne(
+                        "SELECT examinerID
                      FROM examiners
                      WHERE full_name=:fullName",
-                    array('fullName' => $values['Real_name'])
-                );
-            } else {
-                $DB->update(
-                    'examiners',
-                    array(
-                     'radiologist' => $ex_radiologist,
-                     'userID'      => $uid,
-                    ),
-                    array(
-                     "full_name" => $values['Real_name'],
-                    )
-                );
-                //get existing sites for examiner
-                $ex_prev_sites = $DB->pselectCol(
-                    "SELECT centerID
+                        array('fullName' => $values['Real_name'])
+                    );
+                } else {
+
+                    $DB->update(
+                        'examiners',
+                        array(
+                         'radiologist' => $ex_radiologist,
+                         'userID'      => $uid,
+                        ),
+                        array(
+                         "full_name" => $values['Real_name'],
+                        )
+                    );
+                    $examinerID = $examinerID[0]['examinerID'];
+
+                    //get existing sites for examiner
+                    $prev_sites = $DB->pselect(
+                        "SELECT centerID
                  FROM examiners_psc_rel epr
                  WHERE examinerID=:eid",
-                    array("eid" => $examinerID)
-                );
-            }
+                        array("eid" => $examinerID)
+                    );
 
-            foreach ($ex_curr_sites as $k => $v) {
-                //Check if examiner already in db for site
-                $result = $DB->pselectRow(
-                    "SELECT epr.centerID
+                    //get sites where user is already an examiner at for compare
+                    foreach ($prev_sites as $row => $center) {
+                        array_push($ex_prev_sites, $center['centerID']);
+                    }
+                }
+
+                foreach ($ex_curr_sites as $k => $v) {
+
+                    //Check if examiner already in db for site
+                    $result = $DB->pselectRow(
+                        "SELECT epr.centerID
                          FROM examiners_psc_rel epr 
                          WHERE epr.examinerID=:eid AND epr.centerID=:cid",
-                    array(
-                     "eid" => $examinerID,
-                     "cid" => $v,
-                    )
-                );
-                // examiner was not previously added, add and set to active
-                if (empty($result)) {
-                    $DB->insert(
-                        'examiners_psc_rel',
                         array(
-                         'examinerID'       => $examinerID,
-                         'centerID'         => $v,
-                         'active'           => 'Y',
-                         'pending_approval' => $ex_pending,
+                         "eid" => $examinerID,
+                         "cid" => $v,
                         )
                     );
-                } else {
+
+                    // examiner was not previously added, add and set to active
+                    if (empty($result)) {
+                        $DB->insert(
+                            'examiners_psc_rel',
+                            array(
+                             'examinerID'       => $examinerID,
+                             'centerID'         => $v,
+                             'active'           => 'Y',
+                             'pending_approval' => $ex_pending,
+                            )
+                        );
+                    } else {
+                        $DB->update(
+                            'examiners_psc_rel',
+                            array(
+                             'active'           => 'Y',
+                             'pending_approval' => $ex_pending,
+                            ),
+                            array(
+                             'examinerID' => $examinerID,
+                             'centerID'   => $v,
+                            )
+                        );
+                    }
+                    unset($values[$k]);
+                }
+
+                //de-activate examiner if sites where no longer checked
+                $ex_inactive = array_diff($ex_prev_sites, $ex_curr_sites);
+
+                foreach ($ex_inactive as $cid) {
                     $DB->update(
                         'examiners_psc_rel',
-                        array(
-                         'active'           => 'Y',
-                         'pending_approval' => $ex_pending,
-                        ),
+                        array("active" => 'N'),
                         array(
                          'examinerID' => $examinerID,
-                         'centerID'   => $v,
+                         'centerID'   => $cid,
                         )
                     );
                 }
-                unset($values[$k]);
-            }
-            //de-activate examiner if sites where no longer checked
-            $ex_inactive = array_diff($ex_prev_sites, $ex_curr_sites);
-            foreach ($ex_inactive as $cid) {
-                $DB->update(
-                    'examiners_psc_rel',
-                    array("active" => 'N'),
-                    array(
-                     'examinerID' => $examinerID,
-                     'centerID'   => $cid,
-                    )
-                );
             }
+            unset($values['examiner_radiologist']);
+            unset($values['examiner_pending']);
         }
-        unset($values['examiner_radiologist']);
-        unset($values['examiner_pending']);
         //END EXAMINER UPDATE
         // make the set
         foreach ($values as $key => $value) {
@@ -846,6 +865,7 @@ class Edit_User extends \NDB_Form
      */
     function _validateEditUser($values)
     {
+        $editor = \User::singleton();
         // create DB object
         $DB     = \Database::singleton();
         $errors = array();
@@ -995,28 +1015,31 @@ class Edit_User extends \NDB_Form
         //======================================
         //        Validate Examiner Status
         //======================================
-        $matched =false;
-        foreach ($values as $k=>$v) {
-            if (preg_match("/^ex_[0-9]+$/", $k)) {
-                $matched =true;
-                if ($values['examiner_radiologist'] == '') {
-                    $errors['examiner_group'] = "Please specify if examiner is a " .
-                        "radiologist";
+        if ($editor->hasPermission('examiner_multisite')) {
+            $matched = false;
+            foreach ($values as $k => $v) {
+                if (preg_match("/^ex_[0-9]+$/", $k)) {
+                    $matched = true;
+                    if ($values['examiner_radiologist'] == '') {
+                        $errors['examiner_group'] = "Please specify if examiner " .
+                            "is a radiologist";
 
-                }
-                if ($values['examiner_radiologist'] !== ''
-                    && $values['examiner_pending'] == ''
-                ) {
-                    $errors['examiner_group'] = "Please set pending approval Yes ".
-                        "or No";
+                    }
+                    if ($values['examiner_radiologist'] !== ''
+                        && $values['examiner_pending'] == ''
+                    ) {
+                        $errors['examiner_group'] = "Please set pending " .
+                            "approval Yes or No";
+                    }
                 }
             }
-        }
-        if (!$matched
-            && ($values['examiner_radiologist'] !== ''
-            || $values['examiner_pending'] !== '')
-        ) {
-            $errors['examiner_sites'] = "Please select at least one examiner site.";
+            if (!$matched
+                && ($values['examiner_radiologist'] !== ''
+                || $values['examiner_pending'] !== '')
+            ) {
+                $errors['examiner_sites'] = "Please select at least one examiner 
+                site.";
+            }
         }
         return $errors;
     }
diff --git a/modules/user_accounts/php/my_preferences.class.inc b/modules/user_accounts/php/my_preferences.class.inc
index 81527b302dc..ea2cb7de4e5 100644
--- a/modules/user_accounts/php/my_preferences.class.inc
+++ b/modules/user_accounts/php/my_preferences.class.inc
@@ -40,7 +40,7 @@ class My_Preferences extends \NDB_Form
     /**
      * Computes the initial values this page will be filled with.
      *
-     * @return the default values for the initial state of this page.
+     * @return array the default values for the initial state of this page.
      */
     function _getDefaults()
     {
@@ -244,8 +244,6 @@ class My_Preferences extends \NDB_Form
     {
         parent::setup();
 
-        $DB =& \Database::singleton();
-
         $this->identifier = $_SESSION['State']->getUsername();
 
         $user =& \User::singleton($this->identifier);
@@ -317,14 +315,7 @@ class My_Preferences extends \NDB_Form
         $this->form->addElement('password', '__Confirm', 'Confirm Password');
 
         // language preference
-        $languagesDB = $DB->pselect(
-            "SELECT language_id, language_label
-             FROM language",
-            array()
-        );
-        foreach ($languagesDB as $language) {
-            $languages[$language['language_id']] = $language['language_label'];
-        }
+        $languages = \Utility::getLanguageList();
         $this->addSelect('language_preference', 'Language preference', $languages);
 
         // Notification headers
diff --git a/modules/user_accounts/php/user_accounts.class.inc b/modules/user_accounts/php/user_accounts.class.inc
index fd1833d5662..4afcb36f316 100644
--- a/modules/user_accounts/php/user_accounts.class.inc
+++ b/modules/user_accounts/php/user_accounts.class.inc
@@ -42,8 +42,7 @@ class User_Accounts extends \NDB_Menu_Filter
     * Setup Variables
     *
     * @note   Setup Variables
-    * @return bool
-    * @access private
+    * @return void
     */
     function _setupVariables()
     {
@@ -90,7 +89,6 @@ class User_Accounts extends \NDB_Menu_Filter
                                'email'     => 'users.Email',
                                'pending'   => 'users.Pending_approval',
                               );
-        return true;
     }
 
     /**
@@ -98,7 +96,7 @@ class User_Accounts extends \NDB_Menu_Filter
      * that are common to every type of page. May be overridden by a specific
      * page or specific page type.
      *
-     * @return none
+     * @return void
      */
     function setup()
     {
diff --git a/modules/user_accounts/templates/form_edit_user.tpl b/modules/user_accounts/templates/form_edit_user.tpl
index d6a787c4378..c5cf29bd7c1 100644
--- a/modules/user_accounts/templates/form_edit_user.tpl
+++ b/modules/user_accounts/templates/form_edit_user.tpl
@@ -306,6 +306,7 @@
         </div>
         {/if}
     </div>
+    {if $form.examiner_sites}
     {if $form.errors.examiner_sites}
     <div class="row form-group form-inline form-inline has-error">
         {else}
@@ -323,7 +324,8 @@
             </div>
             {/if}
         </div>
-    </div>
+    {/if}
+      {if $form.examiner_group}
     {if $form.errors.examiner_group}
     <div class="row form-group form-inline form-inline has-error">
         {else}
@@ -333,7 +335,7 @@
                 {$form.examiner_group.label}
             </label>
             <div class="col-sm-10">
-                <b>{$form.examiner_group.html}<b>
+                <b>{$form.examiner_group.html}</b>
                 </div>
                 {if $form.errors.examiner_group}
                 <div class="col-sm-offset-2 col-xs-12">
@@ -341,8 +343,8 @@
                 </div>
                 {/if}
             </div>
-        </div>
-        <div class="row form-group form-inline">
+      {/if}
+      <div class="row form-group form-inline">
            <label class="col-sm-2">
               {$form.Active.label}
           </label>
diff --git a/php/installer/Database.class.inc b/php/installer/Database.class.inc
index 5d8bf5e8ffe..99dfddbb276 100644
--- a/php/installer/Database.class.inc
+++ b/php/installer/Database.class.inc
@@ -13,6 +13,8 @@
  * @license  http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
  * @link     https://www.github.com/aces/Loris/
  */
+namespace LORIS\Installer;
+use \PDO;
 
 /**
  * The Installer Database class is like the LORIS database class, except it
@@ -44,6 +46,78 @@ class Database
         return $DB;
     }
 
+    /**
+     * Checks if the current MySQL user has a specified privilege.
+     *
+     * @param string $database  The database to check
+     * @param string $table     The table to check
+     * @param string $privilege A string representing the privilege
+     *
+     * @see https://dev.mysql.com/doc/refman/5.5/en/privileges-provided.html
+     *      Table 6.2 Permissible Privileges for GRANT and REVOKE; "Privilege" column
+     *
+     * @return bool Returns true if current MySQL user has the specified privilege
+     */
+    public function hasPrivilege($database, $table, $privilege)
+    {
+        $stmt    = $this->PDO->query("SHOW GRANTS");
+        $results = $stmt->fetchAll(PDO::FETCH_COLUMN);
+        $stmt->closeCursor();
+        $pattern = "/GRANT .*(ALL|${privilege}).* ON" .
+            " `?([*]|${database})`?[.]`?([*]|${table})`?/";
+
+        // Test all privileges return from SHOW GRANTS agains the pattern
+        return array_reduce(
+            $results,
+            function ($carry, $privilege) use ($pattern) {
+                // Return true if a previous iteration returned true or the
+                // current priviledges matches the pattern.
+                return $carry || (preg_match($pattern, $privilege) === 1);
+            },
+            false
+        );
+    }
+
+    /**
+     * Checks if the database exists
+     *
+     * @param bool $database The database name
+     *
+     * @return bool Returns true if the database exists
+     */
+    public function databaseExists($database)
+    {
+        $stmt = $this->PDO->prepare("SHOW DATABASES LIKE :v_db");
+        $stmt->execute(array('v_db' => $database ));
+        $exists = !empty($stmt->fetchAll());
+
+        return $exists;
+    }
+
+    /**
+     * Checks if we can access the database with the given info
+     *
+     * @param string $host     The host
+     * @param string $database The database
+     * @param string $username The username
+     * @param string $password The password
+     *
+     * @return bool Returns true of the user can log in with the given info
+     */
+    public static function canLogIn($host, $database, $username, $password)
+    {
+        try {
+            $test = new PDO(
+                "mysql:host={$host};dbname={$database};charset=UTF8",
+                $username,
+                $password
+            );
+            return true;
+        } catch (Exception $ex) {
+            return false;
+        }
+    }
+
     /**
      * This wrapper connects differently than the normal database wrapper.
      * Instead of connecting to a database, it will connect to the server,
@@ -55,13 +129,11 @@ class Database
      * script are satisfied while we're connecting. This will only happen
      * once.
      *
-     * @param string $database     The database to be created
-     * @param string $username     The username to connect as
-     * @param string $password     The password to connect with
-     * @param string $host         The hostname that the SQL server is running
-     *                             on.
-     * @param bool   $trackChanges Unused. For signature compatibility with the
-     *                             "real" Database class.
+     * @param string $database The database to be created
+     * @param string $username The username to connect as
+     * @param string $password The password to connect with
+     * @param string $host     The hostname that the SQL server is running
+     *                         on.
      *
      * @return bool true on success, false on failure.
      */
@@ -69,8 +141,7 @@ class Database
         $database,
         $username,
         $password,
-        $host,
-        $trackChanges = true
+        $host
     ) {
         try {
             $this->PDO = new PDO(
@@ -80,42 +151,15 @@ class Database
             );
             $this->PDO->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_WARNING);
 
-            $userperms = $this->PDO->query(
-                "SELECT
-                   Create_user_priv, Create_priv
-                 FROM `mysql`.`user`
-                 WHERE CONCAT(user, '@', host)=CURRENT_USER"
-            );
-
-            $userperms = $userperms->fetchall(PDO::FETCH_ASSOC);
-
-            if (count($userperms) != 1) {
-                $this->lastErr = "Error retrieving user permissions for $username.";
-                return false;
-            }
-
-            $userperms = $userperms[0];
-            if ($userperms['Create_priv'] != 'Y') {
-                $this->lastErr = "User does not have create "
-                . "privileges.";
-                return false;
-            }
-            if ($userperms['Create_user_priv'] != 'Y') {
-                $this->lastErr = "Specified user can not create new "
-                ." user for LORIS to connect as.";
-                return false;
-            }
-
-            $dbexists = $this->PDO->query("SHOW DATABASES LIKE '$database'")
-                ->fetch(PDO::FETCH_ASSOC);
-            // this needs to be !empty, because otherwise if there's
-            // no results returned count($dbexists) == 1 when no
-            // results are returned, because the result isn't an array
-            // Something to do with how the Countable interface is
-            // implemented in PHP..
-            if (!empty($dbexists)) {
-                $this->lastErr = "Database $database already exists."
-                . " Can only install new databases.";
+            if (!$this->hasPrivilege("*", "*", "CREATE")) {
+                if ($this->databaseExists($database)) {
+                     $this->lastErr = "User does not have create database ".
+                        "privileges but the database `{$database}` already exists.".
+                        "Consider checking the 'use existing database checkbox'.";
+                } else {
+                     $this->lastErr = "User does not have create database "
+                    . "privileges; cannot create `{$database}`";
+                }
                 return false;
             }
 
@@ -125,9 +169,6 @@ class Database
         } catch(Exception $e) {
             return false;
         }
-        // should be inaccessible, but include it just in case we
-        // somehow get here.
-        return false;
     }
 
     /**
@@ -152,17 +193,30 @@ class Database
         $trackChanges = true
     ) {
         if ($this->isConnected() === true) {
+            if (!$this->databaseExists($database)) {
+                $this->lastErr = "Database `{$database}` does not ".
+                    "exist; consider creating it first";
+                return false;
+            }
+            $this->PDO->exec("USE $database");
             return true;
         }
         try {
-             $this->PDO = new PDO(
-                 "mysql:host=$host;dbname=$database;charset=UTF8",
-                 $username,
-                 $password
-             );
-             $this->PDO->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_WARNING);
-             return true;
+            $this->PDO = new PDO(
+                "mysql:host=$host;charset=UTF8",
+                $username,
+                $password
+            );
+            $this->PDO->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_WARNING);
+            if (!$this->databaseExists($database)) {
+                $this->lastErr = "Database `{$database}` does not exist; ".
+                    "consider creating it first";
+                return false;
+            }
+            $this->PDO->exec("USE $database");
+            return true;
         } catch(Exception $e) {
+            error_log($e->getMessage());
             $this->lastErr = "Exceptional error connecting to the database "
             . $database . ".";
             return false;
diff --git a/php/installer/Installer.class.inc b/php/installer/Installer.class.inc
index 204113328c7..3e6b0c91473 100644
--- a/php/installer/Installer.class.inc
+++ b/php/installer/Installer.class.inc
@@ -403,6 +403,12 @@ class Installer
             return false;
         }
 
+        if (!$DB->hasPrivilege("mysql", "user", "SELECT")) {
+            $this->_lastErr = $values['dbadminuser'] . " does not have privilege to"
+                . " check if a mysql user exists. Please create that user manually"
+                . " then use the `Already created checkbox below.";
+            return false;
+        }
         // This script is being run by the web server, so get the host
         // that the current user is connect from to be the host of the
         // new user, since the new user is also going to be used from
@@ -443,17 +449,16 @@ class Installer
             // (the MySQL Password() function has been deprecated,
             // so we can't rely on it to select a hash from the mysql.user
             // table and compare.)
-            try {
-                $test = new PDO(
-                    "mysql:host=$values[dbhost];dbname=$values[dbname];charset=UTF8",
-                    $values['lorismysqluser'],
-                    $values['lorismysqlpassword']
-                );
-
+            if (Database::canLogIn(
+                $values["dbhost"],
+                $values["dbname"],
+                $values["lorismysqluser"],
+                $values["lorismysqlpassword"]
+            )) {
                 // the user already exists and the password is valid.
                 // we don't need to go any further than this.
                 return true;
-            } catch(Exception $e) {
+            } else {
                 // the user already exists but we couldn't connect as it.
                 $this->_lastErr = "MySQL user $quotedUser already exists and "
                 . " password does not match or it does not"
@@ -463,6 +468,11 @@ class Installer
             }
         }
 
+        if (!$DB->hasPrivilege("*", "*", "CREATE USER")) {
+            $this->_lastErr = "User does not have privilege to create "
+                . "a mysql user.";
+            return false;
+        }
         // The user does not exist and needs to be created
         $DB->PDO->exec(
             "CREATE USER $quotedUser IDENTIFIED BY " .
@@ -515,10 +525,13 @@ class Installer
         }
 
         $stmt = $DB->prepare(
-            "UPDATE users SET UserID=:q_userID, Password_hash=:q_password, "
-            . "   Password_expiry=DATE_FORMAT(DATE_ADD(CURRENT_TIMESTAMP, "
-            . "                     INTERVAL 30 DAY), '%Y-%m-%d')"
-            . " WHERE ID=1"
+            "UPDATE users
+             SET
+               UserID=:q_userID,
+               Password_hash=:q_password,
+               Active='Y',
+               Password_expiry=DATE_ADD(NOW(),INTERVAL 30 DAY)
+             WHERE ID=1"
         );
         return $stmt->execute(
             [
@@ -554,6 +567,14 @@ class Installer
      */
     function getConfigContent($values)
     {
+        // Value cleanup
+        $escapedValues = array_map(
+            function ($val) {
+                return htmlspecialchars($val, ENT_XML1, 'ISO-8859-1');
+            },
+            $values
+        );
+
         $contents = file_get_contents(__DIR__ . "/../../docs/config/config.xml");
         return str_replace(
             [
@@ -563,10 +584,10 @@ class Installer
              '%DATABASE%',
             ],
             [
-             $values['dbhost'],
-             $values['lorismysqluser'],
-             $values['lorismysqlpassword'],
-             $values['dbname'],
+             $escapedValues['dbhost'],
+             $escapedValues['lorismysqluser'],
+             $escapedValues['lorismysqlpassword'],
+             $escapedValues['dbname'],
             ],
             $contents
         );
@@ -584,13 +605,7 @@ class Installer
      */
     function writeConfig($values)
     {
-        $escapedValues = array_map(
-            function ($val) {
-                return htmlspecialchars($val, ENT_XML1, 'ISO-8859-1');
-            },
-            $values
-        );
-        $contents = $this->getConfigContent($escapedValues);
+        $contents = $this->getConfigContent($values);
         file_put_contents(__DIR__ . "/../../project/config.xml", $contents);
         return true;
     }
diff --git a/php/libraries/AnonymousUser.class.inc b/php/libraries/AnonymousUser.class.inc
index e0598d3b49a..5c3432260d3 100644
--- a/php/libraries/AnonymousUser.class.inc
+++ b/php/libraries/AnonymousUser.class.inc
@@ -28,10 +28,10 @@ class AnonymousUser extends \User
     /**
      * An anonymous user is not a member of any site.
      *
-     * @return array of site names
+     * @return string The empty string
      */
-    public function getSiteNames() : array
+    public function getSiteNames() : string
     {
-        return array();
+        return "";
     }
 }
diff --git a/php/libraries/Candidate.class.inc b/php/libraries/Candidate.class.inc
index 0512cbe6842..97024a8f21a 100644
--- a/php/libraries/Candidate.class.inc
+++ b/php/libraries/Candidate.class.inc
@@ -578,58 +578,6 @@ class Candidate
         return $result["nextVisitNo"];
     }
 
-    /**
-     * Return the suggested visit label for the time point you are
-     * trying to register
-     *
-     * @return string Next suggested visit label
-     * @throws DatabaseException
-     */
-    public function getNextVisitLabel()
-    {
-        $factory = NDB_Factory::singleton();
-        $config  = $factory->config();
-
-        $visitLabelSettings = $config->getSetting('visitLabel');
-        $nextVisitLabel     = null;
-
-        $candID = $this->getCandID();
-
-        // make a local reference to the Database object
-        $db = $factory->database();
-
-        if ($visitLabelSettings['generation'] == 'user'
-            && !empty($visitLabelSettings['suggest'])
-        ) {
-            $existingVisitLabels = $this->getListOfVisitLabels();
-            $query  = "SELECT IFNULL(max(VisitNo)+1, 1) AS nextVisitLabel
-                FROM session
-                WHERE CandID=:CaID AND (Active='Y' OR Active is null)
-                GROUP BY CandID";
-            $result = $db->pselectRow($query, array('CaID' => $candID));
-
-            $nextVisitLabel = $result['nextVisitLabel'];
-            if (!empty($existingVisitLabels)) {
-                while (in_array($nextVisitLabel, $existingVisitLabels)) {
-                    $nextVisitLabel++;
-                }
-            } else {
-                // display V1 as a suggested visit label when starting
-                // the 1st timepoint
-                $nextVisitLabel = '1';
-            }
-
-            $nextVisitLabel = str_replace(
-                '%value%',
-                $nextVisitLabel,
-                $visitLabelSettings['suggest']
-            );
-        }
-
-        //return the next visit No
-        return $nextVisitLabel;
-    }
-
     /**
      * Generates list of valid subprojects for a the selected Candidate's
      * project
diff --git a/php/libraries/CouchDB.class.inc b/php/libraries/CouchDB.class.inc
index 5e57700fc60..90057c14b7b 100644
--- a/php/libraries/CouchDB.class.inc
+++ b/php/libraries/CouchDB.class.inc
@@ -163,6 +163,26 @@ class CouchDB
      */
     private $_database = '';
 
+    /**
+     * Keep the host name
+     */
+    private $_host = '';
+
+    /**
+     * Keep the port number
+     */
+    private $_port = '';
+
+    /**
+     * Keep the user name
+     */
+    private $_user = '';
+
+    /**
+     * Keep the password value
+     */
+    private $_password = '';
+
     /**
      * Boolean true if we are currently doing a bulk transaction.
      */
@@ -178,10 +198,24 @@ class CouchDB
      * Private Constructor for CouchDB
      *
      * @param string $database The couchDB database name
+     * @param string $host     The couchDB host name
+     * @param string $port     The couchDB port number
+     * @param string $user     The couchDB user name
+     * @param string $password The couchDB password
      */
-    private function __construct($database = '')
-    {
+    private function __construct(
+        string $database = '',
+        string $host = '',
+        string $port = '',
+        string $user = '',
+        string $password = ''
+    ) {
+
         $this->_database = $database;
+        $this->_host     = $host;
+        $this->_port     = $port;
+        $this->_user     = $user;
+        $this->_password = $password;
     }
 
     /**
@@ -193,20 +227,83 @@ class CouchDB
      *       which calls this.
      *
      * @param string $database The couchDB database name
+     * @param string $host     The couchDB host name
+     * @param int    $port     The couchDB port number
+     * @param string $user     The couchDB user name
+     * @param string $password The couchDB password
+     *
+     * @throws ConfigurationException When not all parameters are passed and it
+     *                                is not a backwards support deprecated case
      *
      * @return CouchDB A Loris CouchDB wrapper object
      */
-    static function &getInstance($database = null)
-    {
-        if (empty(self::$_instances[$database])) {
+    static function &getInstance(
+        string $database = "",
+        string $host = "",
+        int    $port = 0,
+        string $user = "",
+        string $password = ""
+    ) {
 
-            if (empty($database)) {
+        if (empty(self::$_instances[$database])) {
+            if (empty($database)
+                && empty($host)
+                && ($port === 0)
+                && empty($user)
+                && empty($password)
+            ) {
+                // check if no parameters are passed
+                // deprecated behaviour, backwards compatible until next major
+                // Default to DQT
+                $config      = \NDB_Config::singleton();
+                $couchConfig = $config->getSetting("CouchDB");
+
+                $database = $couchConfig['dbName'];
+                $host     = $couchConfig['hostname'];
+                $port     = $couchConfig['port'];
+                $user     = $couchConfig['admin'];
+                $password = $couchConfig['adminpass'];
+                error_log(
+                    "LORIS Deprecation Warning: CouchDB::getInstance() will no 
+                    longer auto-loading CouchDB credentials, make sure to specify 
+                    all necessary parameters in the function call."
+                );
+            } else if (!empty($database)
+                && empty($host)
+                && empty($port)
+                && empty($user)
+                && empty($password)
+            ) {
+                // check if only database name given (assume the rest same as dqt)
+                // deprecated behaviour, backwards compatible until next major
                 // Default to DQT
-                $config   = \NDB_Config::singleton();
-                $database = $config->getSetting("CouchDB")['dbName'];
+                $config      = \NDB_Config::singleton();
+                $couchConfig = $config->getSetting("CouchDB");
+
+                $host     = $couchConfig['hostname'];
+                $port     = $couchConfig['port'];
+                $user     = $couchConfig['admin'];
+                $password = $couchConfig['adminpass'];
+                error_log(
+                    "LORIS Deprecation Warning: CouchDB::getInstance() will no 
+                    longer support accepting only a database name, make sure to 
+                    specify all necessary parameters in the function call."
+                );
+            } else if (empty($database)
+                || empty($host)
+                || empty($port)
+                || empty($user)
+                || empty($password)
+            ) {
+                // check if only some parameters given but not all AND does not
+                // enter any of the above IF statements. this behavior was never
+                // supported and should be an error.
+                throw new ConfigurationException(
+                    "CouchDB::getInstance() requires all parameters to be supplied."
+                );
             }
 
-            $db = new CouchDB($database);
+            $db = new CouchDB($database, $host, $port, $user, $password);
             $db->SocketHandler = new SocketWrapper();
 
             self::$_instances[$database] = $db;
@@ -239,12 +336,9 @@ class CouchDB
      */
     function _getURL($url, $op = 'GET', $headers = array())
     {
-        $config      = NDB_Config::singleton();
-        $couchconfig = $config->getSetting('CouchDB');
-
         $handler = $this->SocketHandler;
-        $handler->setHost($couchconfig['hostname']);
-        $handler->setPort($couchconfig['port']);
+        $handler->setHost($this->_host);
+        $handler->setPort($this->_port);
 
         $handler->open();
         $handler->write("$op $url HTTP/1.0\r\n");
@@ -274,19 +368,16 @@ class CouchDB
      */
     function _getRelativeURL($url, $op = 'GET')
     {
-        $config      = NDB_Config::singleton();
-        $couchconfig = $config->getSetting('CouchDB');
-
         $handler = $this->SocketHandler;
-        $handler->setHost($couchconfig['hostname']);
-        $handler->setPort($couchconfig['port']);
+        $handler->setHost($this->_host);
+        $handler->setPort($this->_port);
 
         $handler->open();
         $handler->write($this->_constructURL($op, $url) . " HTTP/1.0\r\n");
         $handler->write(
             "Authorization: Basic "
             . base64_encode(
-                $couchconfig['admin'] . ":" . $couchconfig['adminpass']
+                $this->_user . ":" . $this->_password
             )
             . "\r\n"
         );
@@ -335,12 +426,9 @@ class CouchDB
      */
     function _postURL($url, $data, $headers = array(), $printValue = false)
     {
-        $config      = NDB_Config::singleton();
-        $couchconfig = $config->getSetting('CouchDB');
-
         $handler = $this->SocketHandler;
-        $handler->setHost($couchconfig['hostname']);
-        $handler->setPort($couchconfig['port']);
+        $handler->setHost($this->_host);
+        $handler->setPort($this->_port);
 
         $handler->open();
         $handler->write($url . " HTTP/1.0\r\n");
@@ -350,9 +438,7 @@ class CouchDB
         $handler->write(
             "Authorization: Basic "
             . base64_encode(
-                $couchconfig['admin']
-                . ":"
-                . $couchconfig['adminpass']
+                $this->_user . ":" . $this->_password
             )
             . "\r\n"
         );
diff --git a/php/libraries/Database.class.inc b/php/libraries/Database.class.inc
index 9dc9985077e..8ef2a5b1694 100644
--- a/php/libraries/Database.class.inc
+++ b/php/libraries/Database.class.inc
@@ -730,9 +730,9 @@ class Database
     }
 
     /**
-     * Runs a query as a prepared statement and returns the values of the first
-     * column in the select statement. If multiple columns are given, only the first
-     * will be returned.
+     * Runs a query as a prepared statement and returns the values of the
+     * column given in the select statement. If multiple columns are given, an error
+     * is thrown.
      *
      * @param string $query  The SQL SELECT query to be run
      * @param array  $params Values to use for binding to prepared statement
@@ -740,7 +740,7 @@ class Database
      * @throws DatabaseException if the query selected more than one column
      *
      * @return array Associative array of form rowID=>value containing all values
-     *               for the first element of the select statement
+     *               for the only column of the select statement
      */
     function pselectCol($query, $params)
     {
diff --git a/php/libraries/LorisApp.class.inc b/php/libraries/LorisApp.class.inc
deleted file mode 100644
index 25b7f8b7ea5..00000000000
--- a/php/libraries/LorisApp.class.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * LorisApp class file
- *
- * PHP version 7
- *
- * @category Main
- * @package  Main
- * @author   Jacob Penny <jpenny.mcin@gmail.com>
- * @license  http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
- * @link     https://www.github.com/aces/Loris/
- */
-
-/**
- * LorisApp Class
- *
- * Wrapper around \Slim\App in order to decrease coupling
- *
- * @category Main
- * @package  Main
- * @author   Jacob Penny <jpenny.mcin@gmail.com>
- * @license  http://www.gnu.org/licenses/gpl-3.0.txt GPLv3
- * @link     https://www.github.com/aces/Loris/
- */
-class LorisApp extends \Slim\App
-{
-
-}
diff --git a/php/libraries/LorisForm.class.inc b/php/libraries/LorisForm.class.inc
index a6f025011b2..0183842cceb 100644
--- a/php/libraries/LorisForm.class.inc
+++ b/php/libraries/LorisForm.class.inc
@@ -1301,11 +1301,7 @@ class LorisForm
 
                 // Check if date fields have errors and add them to error list
                 if ($el['type'] === 'date') {
-                    $date = (
-                        $values[$elName] ?
-                            $values[$elName] :
-                        $this->getValue($el['name'])
-                    );
+                    $date = $values[$elName] ?? $this->getValue($el['name']);
                     if (empty($date)) {
                         continue;
                     }
@@ -2265,12 +2261,14 @@ class LorisFormElement
     }
 
     /**
-     * Stub. Does nothing.
+     * Stub. Does nothing. Child classes may return nearly any type
+     * as relevant for the value of their element type.
      *
-     * @return void
+     * @return array|string|bool|null
      */
     function getValue()
     {
+        return null;
     }
 };
 
@@ -2332,7 +2330,8 @@ class LorisFormFileElement extends LorisFormElement
      * Extracts the value of the file as represented in PHP $_FILES
      * superglobal. This seems to be how QuickForm handled it.
      *
-     * @return array of the form used by $_FILES superglobal
+     * @return array|false of the form used by $_FILES superglobal or false
+     *         on failure
      */
     function getValue()
     {
diff --git a/php/libraries/NDB_BVL_Feedback.class.inc b/php/libraries/NDB_BVL_Feedback.class.inc
index 16ae5c31f8b..d98f95f919f 100644
--- a/php/libraries/NDB_BVL_Feedback.class.inc
+++ b/php/libraries/NDB_BVL_Feedback.class.inc
@@ -1074,7 +1074,7 @@ class NDB_BVL_Feedback
                 return true;
             } else {
                 $Factory       = NDB_Factory::singleton();
-                $DB            = $Factory->Database();
+                $DB            = $Factory->database();
                 $instruments_q = $DB->pselectOne(
                     "SELECT Count(*) FROM test_names WHERE Test_name=:testName",
                     array('testName' => $test_name)
diff --git a/php/libraries/NDB_BVL_Instrument.class.inc b/php/libraries/NDB_BVL_Instrument.class.inc
index ec0cf88895f..3009cbdbfc5 100644
--- a/php/libraries/NDB_BVL_Instrument.class.inc
+++ b/php/libraries/NDB_BVL_Instrument.class.inc
@@ -364,10 +364,9 @@ class NDB_BVL_Instrument extends NDB_Page
 
 
     /**
-     * Method to display the form - usually not overridden as it
-     * includes all the base code that any instrument will require.
+     * Method to display the form for an instrument
      *
-     * @return void
+     * @return string
      * @access public
      */
     function display()
@@ -496,7 +495,7 @@ class NDB_BVL_Instrument extends NDB_Page
      * Attempts to validate the form (using the defined rules) and
      * saves the validated data into the database
      *
-     * @return false if failure to save data
+     * @return bool false if failure to save data
      * @access public
      */
     function save()
@@ -1142,8 +1141,8 @@ class NDB_BVL_Instrument extends NDB_Page
      * @param array $elements The value of all the elements on the current page
      *                        to validate.
      *
-     * @return associative array of errors (fieldname => errormessage) or true
-     *         if no errors.
+     * @return array|true associative array of errors (fieldname => errormessage)
+     *         or true if no errors.
      */
     function XINValidate($elements)
     {
@@ -1213,7 +1212,7 @@ class NDB_BVL_Instrument extends NDB_Page
      * @param string $group   Empty if a non-grouped element is registering the rule.
      *                        Otherwise, name of the group registering the rule.
      *
-     * @return none
+     * @return void
      */
     function XINRegisterRule($elname, $rules, $message="", $group="")
     {
diff --git a/php/libraries/NDB_BVL_Instrument_LINST.class.inc b/php/libraries/NDB_BVL_Instrument_LINST.class.inc
index ac474e9001b..056396965b9 100644
--- a/php/libraries/NDB_BVL_Instrument_LINST.class.inc
+++ b/php/libraries/NDB_BVL_Instrument_LINST.class.inc
@@ -146,7 +146,7 @@ class NDB_BVL_Instrument_LINST extends \NDB_BVL_Instrument
      * @param array $elements The value of all the elements on the current page
      *                        to validate.
      *
-     * @return associative array of errors (fieldname => errormessage) or true
+     * @return array associative array of errors (fieldname => errormessage) or true
      *         if no errors.
      */
     function XINValidate($elements)
@@ -374,7 +374,7 @@ class NDB_BVL_Instrument_LINST extends \NDB_BVL_Instrument
     * @param string $group   Empty if a non-grouped element is registering the rule.
     *                        Otherwise, name of the group registering the rule.
     *
-    * @return none
+    * @return void
     */
     function XINRegisterRule($elname, $rules, $message="", $group="")
     {
@@ -770,7 +770,7 @@ class NDB_BVL_Instrument_LINST extends \NDB_BVL_Instrument
      *                         data URL, so we shouldn't check that the file exists
      *                         on the filesystem. (Used by preview)
      *
-     * @return null Registers all instrument rules as a side-effect.
+     * @return void but registers all instrument rules as a side-effect.
      */
     function loadInstrumentRules($filename, $base64 = false)
     {
diff --git a/php/libraries/NDB_BVL_Instrument_instrument_preview.class.inc b/php/libraries/NDB_BVL_Instrument_instrument_preview.class.inc
index e8ea862f2fa..ef431fa526b 100644
--- a/php/libraries/NDB_BVL_Instrument_instrument_preview.class.inc
+++ b/php/libraries/NDB_BVL_Instrument_instrument_preview.class.inc
@@ -34,7 +34,7 @@ class NDB_BVL_Instrument_Instrument_Preview
      *
      * @return void
      */
-    function setup($commentID, $page)
+    function setup($commentID=null, $page=null)
     {
         $this->commentID = $commentID;
         $this->page      = $page;
@@ -69,7 +69,7 @@ class NDB_BVL_Instrument_Instrument_Preview
     /**
      * Overwrites the save function to not save data since this is only a preview.
      *
-     * @return none
+     * @return bool
      */
     function save()
     {
@@ -92,7 +92,7 @@ class NDB_BVL_Instrument_Instrument_Preview
                 }
             }
         }
-        return;
+        return false;
     }
 
     /**
@@ -101,7 +101,7 @@ class NDB_BVL_Instrument_Instrument_Preview
      * @param array $values Unused, but required so that function as same signature
      *                      as base class
      *
-     * @return none
+     * @return void
      */
     function _save($values)
     {
@@ -113,7 +113,7 @@ class NDB_BVL_Instrument_Instrument_Preview
      *
      * @param string $status ignored
      *
-     * @return none
+     * @return void
      */
     function _setDataEntryCompletionStatus($status)
     {
diff --git a/php/libraries/NDB_Client.class.inc b/php/libraries/NDB_Client.class.inc
index 5df70d38d54..b6d5423de06 100644
--- a/php/libraries/NDB_Client.class.inc
+++ b/php/libraries/NDB_Client.class.inc
@@ -89,7 +89,7 @@ class NDB_Client
         if (!$this->_isWebClient) {
             // Set user as unix username.
             // Requires Loris to have user with this username
-            $user =& User::singleton(getenv('USER'));
+            User::singleton(getenv('USER'));
             return true;
         }
 
@@ -162,7 +162,6 @@ class NDB_Client
                     header("Location: /login/password-expiry");
 
                 }
-
                 $login->setState();
             } elseif ($auth === false) {
                 // only send a 403 error if they were attempting to log in,
@@ -184,7 +183,7 @@ class NDB_Client
             return false;
         }
 
-        $user =& User::singleton($_SESSION['State']->getUsername());
+        User::singleton($_SESSION['State']->getUsername());
 
         // finished initializing
         return true;
diff --git a/php/libraries/NDB_Factory.class.inc b/php/libraries/NDB_Factory.class.inc
index f11a25bb98f..006ea274662 100644
--- a/php/libraries/NDB_Factory.class.inc
+++ b/php/libraries/NDB_Factory.class.inc
@@ -120,6 +120,8 @@ class NDB_Factory
         }
 
         self::$config = $config;
+        // NDB_Config::singleton() is already loading the config file
+        // in a better way. this needs to be modified
         $config->load($configfile);
         return $config;
     }
@@ -226,13 +228,75 @@ class NDB_Factory
      * Returns a reference to a Loris CouchDB database wrapper.
      *
      * @param string $database The couchDB database name
+     * @param string $host     The couchDB host name
+     * @param int    $port     The couchDB port number
+     * @param string $user     The couchDB user name
+     * @param string $password The couchDB password
      *
      * @return CouchDB CouchDB singleton
      */
-    function couchDB($database = null)
-    {
-        if (empty($database)) {
-            $database = self::config()->getSetting("CouchDB")['dbName'];
+    function couchDB(
+        string $database = "",
+        string $host = "",
+        int $port = 0,
+        string $user = "",
+        string $password = ""
+    ) {
+        if (empty($database)
+            && empty($host)
+            && ($port === 0)
+            && empty($user)
+            && empty($password)
+        ) {
+            // check if no parameters are passed
+            // deprecated behaviour, backwards compatible until next major
+            // Default to DQT
+            $config      = \NDB_Config::singleton();
+            $couchConfig = $config->getSetting("CouchDB");
+
+            $database = $couchConfig['dbName'];
+            $host     = $couchConfig['hostname'];
+            $port     = $couchConfig['port'];
+            $user     = $couchConfig['admin'];
+            $password = $couchConfig['adminpass'];
+            error_log(
+                "LORIS Deprecation Warning: NDB_Factory::CouchDB() will no 
+                 longer support accepting only a database name, make sure to 
+                 specify all necessary parameters in the function call."
+            );
+        } else if (!empty($database)
+            && empty($host)
+            && empty($port)
+            && empty($user)
+            && empty($password)
+        ) {
+            // check if only database name given (assume the rest same as dqt)
+            // deprecated behaviour, backwards compatible until next major
+            // Default to DQT
+            $config      = \NDB_Config::singleton();
+            $couchConfig = $config->getSetting("CouchDB");
+
+            $host     = $couchConfig['hostname'];
+            $port     = $couchConfig['port'];
+            $user     = $couchConfig['admin'];
+            $password = $couchConfig['adminpass'];
+            error_log(
+                "LORIS Deprecation Warning: NDB_Factory::CouchDB() will no 
+                 longer support accepting only a database name, make sure to 
+                 specify all necessary parameters in the function call."
+            );
+        } else if (empty($database)
+            || empty($host)
+            || empty($port)
+            || empty($user)
+            || empty($password)
+        ) {
+            // check if only some parameters given but not all AND does not
+            // enter any of the above IF statements. this behavior was never
+            // supported and should be an error.
+            throw new ConfigurationException(
+                "NDB_Factory::CouchDB() requires all parameters to be supplied."
+            );
         }
 
         if (!empty(self::$_couchdb[$database])) {
@@ -252,7 +316,13 @@ class NDB_Factory
             );
             self::$_couchdb[$database] = new MockCouchDBWrap();
         } else {
-            self::$_couchdb[$database] = CouchDB::getInstance($database);
+            self::$_couchdb[$database] = CouchDB::getInstance(
+                $database,
+                $host,
+                $port,
+                $user,
+                $password
+            );
         }
         return self::$_couchdb[$database];
     }
diff --git a/php/libraries/NDB_Menu.class.inc b/php/libraries/NDB_Menu.class.inc
index e63fbaa9220..7d25520158d 100644
--- a/php/libraries/NDB_Menu.class.inc
+++ b/php/libraries/NDB_Menu.class.inc
@@ -111,7 +111,7 @@ class NDB_Menu extends NDB_Page
     /**
      * Displays the menu page
      *
-     * @return void
+     * @return string
      * @access public
      */
     function display()
diff --git a/php/libraries/NDB_Menu_Filter.class.inc b/php/libraries/NDB_Menu_Filter.class.inc
index 25170da5413..e3f3474fbb1 100644
--- a/php/libraries/NDB_Menu_Filter.class.inc
+++ b/php/libraries/NDB_Menu_Filter.class.inc
@@ -689,7 +689,7 @@ class NDB_Menu_Filter extends NDB_Menu
     /**
      * Displays the menu page
      *
-     * @return void
+     * @return string
      * @access public
      */
     function display()
@@ -746,7 +746,7 @@ class NDB_Menu_Filter extends NDB_Menu
      *
      * Suitable for serializing to JSON, CSV, etc..
      *
-     * @return associative array
+     * @return array
      */
     function toArray()
     {
@@ -774,7 +774,7 @@ class NDB_Menu_Filter extends NDB_Menu
      * Converts the results of this menu filter to a JSON format to be retrieved
      * with ?format=json
      *
-     * @return a json encoded string of the headers and data from this table
+     * @return string a json encoded string of the headers and data from this table
      */
     function toJSON()
     {
diff --git a/php/libraries/NDB_Menu_Filter_Form.class.inc b/php/libraries/NDB_Menu_Filter_Form.class.inc
index 39bd2b0aec2..74b279e6254 100644
--- a/php/libraries/NDB_Menu_Filter_Form.class.inc
+++ b/php/libraries/NDB_Menu_Filter_Form.class.inc
@@ -88,8 +88,7 @@ class NDB_Menu_Filter_Form extends NDB_Menu_Filter
      *
      * @param array $values form values
      *
-     * @return void
-     * @access private
+     * @return bool true if successful
      */
     function _process($values)
     {
diff --git a/php/libraries/NDB_Page.class.inc b/php/libraries/NDB_Page.class.inc
index 6791a591969..5b6d0910d93 100644
--- a/php/libraries/NDB_Page.class.inc
+++ b/php/libraries/NDB_Page.class.inc
@@ -41,7 +41,7 @@ class NDB_Page implements RequestHandlerInterface
     /**
      * Reference to the HTML QuickForm
      *
-     * @var LorisForm
+     * @var \LorisForm
      */
     var $form;
 
diff --git a/php/libraries/NDB_Reliability.class.inc b/php/libraries/NDB_Reliability.class.inc
index 3866849eed8..a525991d3ae 100644
--- a/php/libraries/NDB_Reliability.class.inc
+++ b/php/libraries/NDB_Reliability.class.inc
@@ -87,7 +87,7 @@ class NDB_Reliability extends NDB_Form
     /**
      * Displays the form
      *
-     * @return void
+     * @return string
      * @access public
      */
     function display()
diff --git a/php/libraries/Project.class.inc b/php/libraries/Project.class.inc
index e2222833e2a..74580676dfd 100644
--- a/php/libraries/Project.class.inc
+++ b/php/libraries/Project.class.inc
@@ -194,15 +194,15 @@ class Project
      * @note If the database value is null then the return value will be the sum of
      * all this project's subproject recruitment target.
      *
-     * @return string This project's name
+     * @return int
      */
-    public function getRecruitmentTarget()
+    public function getRecruitmentTarget() : int
     {
         if (empty($this->_recruitmentTarget)) {
             $total = array_reduce(
                 $this->getSubprojects(),
                 function ($carry, $item) {
-                    return $carry + $item->_recruitmentTarget;
+                    return (int )($carry + $item->_recruitmentTarget);
                 },
                 0
             );
@@ -210,7 +210,7 @@ class Project
             // database.
             $this->_recruitmentTarget = $total;
         }
-        return $this->_recruitmentTarget;
+        return (int )$this->_recruitmentTarget;
     }
 
     /**
diff --git a/php/libraries/ProjectDefault.class.inc b/php/libraries/ProjectDefault.class.inc
index 99227eb4237..344121781e8 100644
--- a/php/libraries/ProjectDefault.class.inc
+++ b/php/libraries/ProjectDefault.class.inc
@@ -65,15 +65,15 @@ class ProjectDefault extends Project
     /**
      * Get the project's recruitment target.
      *
-     * @return integer The sum of all subprojects recruitment target
+     * @return int The sum of all subprojects recruitment target
      */
-    public function getRecruitmentTarget()
+    public function getRecruitmentTarget() : int
     {
         if (empty($this->recruitmentTarget)) {
             $total = array_reduce(
                 $this->getSubprojects(),
                 function ($carry, $item) {
-                    return $carry + $item->recruitmentTarget;
+                    return (int )($carry + $item->recruitmentTarget);
                 },
                 0
             );
@@ -81,7 +81,7 @@ class ProjectDefault extends Project
             // database.
             $this->recruitmentTarget = $total;
         }
-        return $this->recruitmentTarget;
+        return (int) $this->recruitmentTarget;
     }
 
     /**
diff --git a/php/libraries/TimePoint.class.inc b/php/libraries/TimePoint.class.inc
index d90c9cbcc52..8cda7b259b3 100644
--- a/php/libraries/TimePoint.class.inc
+++ b/php/libraries/TimePoint.class.inc
@@ -263,15 +263,6 @@ class TimePoint
      */
     static function isValidVisitLabel($candid, $subprojectID, $visitLabel)
     {
-        $config =& \NDB_Config::singleton();
-        $visitLabelSettings = $config->getSetting('visitLabel');
-        foreach (\Utility::toArray($visitLabelSettings) as $setting) {
-            if ($setting['@']['subprojectID'] == $subprojectID) {
-                $visitLabelSettings =$setting;
-                break;
-            }
-        }
-
         // This can happen if the user quickly clicks "Create Time Point" before the
         // page has loaded and the Visit Label dropdown hasn't been selected yet.
         // The page will create "V1" when this is the case without this check.
@@ -281,15 +272,6 @@ class TimePoint
             );
         }
 
-        // make sure the user entered a valid visit label
-        if ($visitLabelSettings['generation'] == 'user') {
-            if (!preg_match($visitLabelSettings['regex'], $visitLabel)) {
-                throw new \LorisException(
-                    'This visit label does not match the required structure.'
-                );
-            }
-        }
-
         $candidate =& \Candidate::singleton($candid);
 
         $timePointArray = $candidate->getListOfVisitLabels();
diff --git a/php/libraries/Utility.class.inc b/php/libraries/Utility.class.inc
index 8dd5ae2ae04..6ffa1218eb3 100644
--- a/php/libraries/Utility.class.inc
+++ b/php/libraries/Utility.class.inc
@@ -578,6 +578,7 @@ class Utility
     static function getDirectInstruments()
     {
         $DB            =& Database::singleton();
+        $instruments   = array();
         $instruments_q = $DB->pselect(
             "SELECT Test_name,Full_name FROM test_names WHERE IsDirectEntry=true",
             array()
@@ -1062,5 +1063,27 @@ class Utility
             return $val;
         }
     }
+
+    /**
+     * Get the list of language available in the database
+     *
+     * @return array Array of language which exist in the database table 'language'
+     *               array is of the form
+     *               array($language_id => $language_label)
+     */
+    static function getLanguageList()
+    {
+        $DB = \Database::singleton();
+
+        $languagesDB = $DB->pselect(
+            "SELECT language_id, language_label
+             FROM language",
+            array()
+        );
+        foreach ($languagesDB as $language) {
+            $languages[$language['language_id']] = $language['language_label'];
+        }
+        return $languages;
+    }
 }
 ?>
diff --git a/smarty/cache/empty b/smarty/cache/empty
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/smarty/configs/empty b/smarty/configs/empty
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/smarty/templates/email/notifier_custom_html.tpl b/smarty/templates/email/notifier_custom_html.tpl
index 1d00be49f49..18289490724 100644
--- a/smarty/templates/email/notifier_custom_html.tpl
+++ b/smarty/templates/email/notifier_custom_html.tpl
@@ -43,7 +43,7 @@
                     <tr>
                         <td style="background-color:#ECF8FF">
                             <p>This is an automated message sent by the Loris system. To configure your notification settings,
-                                follow <a href="{$baseurl}/preferences/">this link to your preference page</a>.</p>
+                                follow <a href="{$baseurl}/user_accounts/my_preferences/">this link to your preference page</a>.</p>
                         </td>
                     </tr>
                     </tbody>
diff --git a/smarty/templates/install.tpl b/smarty/templates/install.tpl
index be20c8ee3c8..e4d0ea92da0 100644
--- a/smarty/templates/install.tpl
+++ b/smarty/templates/install.tpl
@@ -1,165 +1,216 @@
 <html>
-	<head>
-	{* installdb.php is in the root directory, so we know these relative
-	   links should work. Load in the base LORIS bootstrap CSS
-	*}
-		<link rel="stylesheet" href="bootstrap/css/bootstrap.min.css">
-		<link rel="stylesheet" href="bootstrap/css/custom-css.css">
+    <head>
+    {* installdb.php is in the root directory, so we know these relative
+       links should work. Load in the base LORIS bootstrap CSS
+    *}
+        <link rel="stylesheet" href="/bootstrap/css/bootstrap.min.css">
+        <link rel="stylesheet" href="/bootstrap/css/custom-css.css">
 
-		<title>Loris SQL Installer</title>
-	</head>
+        <title>Loris SQL Installer</title>
+    </head>
     <body>
-	<div class="container">
-		<div class="page-header">
-			<h1>LORIS Installer{if $PageName}: {$PageName}{/if}</h1>
-		</div>
-		{if $error}<div class="alert alert-danger error">{$error}</div>{/if}
-		{if $console}<div class="alert alert-warning console"><pre>{$console}</pre></div>{/if}
-		<div>
-		{* Default page is at the end in the else statement. The rest of
-		   the pages are in the order that the user goes through them *}
-		{if $Page == "MySQLUserPrompt"}
-			<p>
-			   Successfully created MySQL database and sourced the schema.
-			   Now, we need to create a non-administer MySQL username for LORIS to use.
-			   This user will be created if it does not already exist.
-			</p>
-			<p>
-			   This username and password will be saved to the LORIS config
-			   file, so it's best to make sure you're using a unique password.
-			</p>
-			<p>
-			   If you're feeling uninspired, here's a randomly generated password:
-				<code>{$SamplePassword}</code>.
-			</p>
-			<p>
-			   We also need to set the username and password for the default
-			   <em>LORIS</em> admin account. This is the account that you will
-			   use to login to the LORIS frontend. Here's another password that
-			   you can user for that account if you don't have something else
-			   in mind: <code>{$SamplePassword2}</code>.
-			</p>
-		<form method="post">
-			<fieldset>
-				<legend>LORIS MySQL User</legend>
-			<div>
-				<label for="lorisuser">Username: <input type="text" name="lorismysqluser" placeholder="ie. lorisuser" value="{$lorismysqluser}">
-			</div>
-			<div>
-				<label for="lorispassword">Password: <input type="password" value="{$lorismysqlpassword}" name="lorismysqlpassword" placeholder="ie. LORISISTHEBEST!!!1">
-			</div>
-			</fieldset>
-			<fieldset>
-				<legend>LORIS Front End Admin</legend>
-			<div>
-				<label for="lorisuser">Username: <input type="text" name="frontenduser" placeholder="ie. myname" value="{$frontenduser}">
-			</div>
-			<div>
-				<label for="lorisuser">Password: <input type="password" name="frontendpassword" placeholder="ie. LORISISSTILLTHEBEST!!1" value="{$frontendpassword}">
-			</div>
-			</fieldset>
-			<input type="hidden" name="formname"        value="createmysqlaccount" />
-			<input type="hidden" name="dbname"          value="{$dbname}" />
-			<input type="hidden" name="dbhost"          value="{$dbhost}" />
-			<input type="hidden" name="dbadminuser"     value="{$dbadminuser}" />
-			<input type="hidden" name="dbadminpassword" value="{$dbadminpassword}" />
-			<div>
-				<input type="submit" />
-			</div>
-		</form>
-	{elseif $Page == "Done"}
-		{if $configfile}
-			<h2>Congratulations! You're done</h2>
-			<p>Wrote LORIS config file to {$configfile}.</p>
-		{else}
-			<h2>Almost done!</h2>
-			<p>The LORIS username was configured, but the web server
-			   wasn't able to write to the file {$configlocation}.</p>
-			<p>Please copy and paste the following into that file
-			   on the server in which this web server is running or
-			   contact your system administer for help:</p>
-			<div>
-				<code><pre>{$configcontent}</pre></code>
-			</div>
-		{/if}
-			<p>
-			  {if $configfile}
-				You should now be able to
-			  {else}
-				After that you should be able to
-			  {/if} access LORIS by visiting
-			  <a href="{$lorisurl}">{$lorisurl}</a> and logging in
-			  with the front end admin username and password you
-			  configured on the previous page.
-			</p>
-	{else}
-		{* Default Page *}
-		<p>Welcome to the LORIS installer.</p>
-		<p>This module is the last step in installing LORIS, before
-		proceeding to do your study configuration.</p>
-		<p>This installer will set up the default users, create the SQL
-		database and load the LORIS database schema, set up some basic
-		server configuration, and reset the default LORIS username and
-		password.
-		<p>In order to proceed you'll need the following information:
-		<ul>
-			<li>A MySQL hostname that you'll be installing
-			    LORIS on, which is accessible from this server.</li>
-			<li>A MySQL root username and password on that server which
-			    has permissions to create databases, tables, and users
-			    (this username and password will not be saved, but is
-			    only used for installing LORIS.)</li>
-			<li>The database name for LORIS to use. It's best to name
-			    your databases after the project being hosted, but if
-			    you're unsure it's safe to use the default value of
-			    "LORIS". This database must <strong>not</strong> already
-			    exist in MySQL.</li>
-		</ul></p>
-		<p>Let's get started.</p>
-		<form method="post">
-			<fieldset>
-				<legend>MySQL Connection Information</legend>
-			<div>
-				<div class="col-md-2">
-					<label for="serverhost">Server Hostname:</label>
-				</div>
-				<div class="col-md-10">
-					<input id="serverhost" value="{$dbhost}" type="text" name="dbhost" placeholder="ie. localhost">
-				</div>
-			</div>
-			<div>
-				<div class="col-md-2">
-					<label for="serveruser">Admin Username:</label>
-				</div>
-				<div class="col-md-10">
-					<input id="serveruser" value="{$dbadminuser}" name="dbadminuser" type="text" placeholder="ie. root">
-				</div>
-			</div>
-			<div>
-				<div class="col-md-2">
-					<label for="serverpassword">Admin Password:</label>
-				</div>
-				<div class="col-md-10">
-					<input id="serverpassword" value="{$dbadminpassword}" type="password" name="dbadminpassword" placeholder="ie. LORISISTHEBEST!!!1">
-				</div>
-			</div>
-			<div>
-				<div class="col-md-2">
-					<label for="dbname">Database name:</label>
-				</div>
-				<div class="col-md-10">
-					<input id="dbname" value="{if $dbname}{$dbname}{else}LORIS{/if}" type="text" name="dbname">
-				</div>
-			</div>
-			</fieldset>
-			<input type="hidden" name="formname" value="validaterootaccount" />
-			<div class="col-md-2">&nbsp;</div>
-			<div class="col-md-10">
-				<input class="btn btn-submit btn-default" type="submit" />
-			</div>
-		</form>
-	{/if}
+    <div class="container">
+        <div class="page-header">
+            <h1>LORIS Installer{if $PageName}: {$PageName}{/if}</h1>
+        </div>
+        {if $error}<div class="alert alert-danger error">{$error}</div>{/if}
+        {if $console}<div class="alert alert-warning console"><pre>{$console}</pre></div>{/if}
+        <div>
+        {* Default page is at the end in the else statement. The rest of
+           the pages are in the order that the user goes through them *}
+        {if $Page == "MySQLUserPrompt"}
+            <p>
+               Successfully created MySQL database and sourced the schema.
+               Now, we need to create a non-administer MySQL username for LORIS to use.
+               This user will be created if it does not already exist.
+            </p>
+            <p>
+               This username and password will be saved to the LORIS config
+               file, so it's best to make sure you're using a unique password.
+            </p>
+            <p>
+               If you're feeling uninspired, here's a randomly generated password:
+                <code>{$SamplePassword}</code>.
+            </p>
+        <form method="post">
+            <fieldset>
+                <legend>LORIS MySQL User</legend>
+            <div>
+                <label for="lorismysqluser">Username: <input type="text" name="lorismysqluser" placeholder="ie. lorisuser" value="{$lorismysqluser}">
+            </div>
+            <div>
+                <label for="lorismysqlpassword">Password: <input type="password" value="{$lorismysqlpassword}" name="lorismysqlpassword" placeholder="ie. LORISISTHEBEST!!!1">
+            </div>
+            <div>
+                <label for="lorismysql_already_created">Already Created:
+                <input type="checkbox" name="lorismysql_already_created" value="on" {($lorismysql_already_created == 'on') ? 'checked' : ''}/>
+            </div>
+            </fieldset>
+            <div>
+                Check "<strong>Already Created</strong>" only if the appropriate mysql user has already been created!<br/>
+                Here is a list of required privileges for that user:<br/>
+                <code>SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, CREATE TEMPORARY TABLES, LOCK TABLES</code>
+            </div>
+            <hr/>
+            <p>
+               We also need to set the username and password for the default
+               <em>LORIS</em> admin account. This is the account that you will
+               use to login to the LORIS frontend. Here's another password that
+               you can use for that account if you don't have something else
+               in mind: <code>{$SamplePassword2}</code>.
+            </p>
+            <fieldset>
+                <legend>LORIS Front End Admin</legend>
+            <div>
+                <label for="frontenduser">Username: <input type="text" name="frontenduser" placeholder="ie. myname" value="{$frontenduser}">
+            </div>
+            <div>
+                <label for="frontendpassword">Password: <input type="password" name="frontendpassword" placeholder="ie. LORISISSTILLTHEBEST!!1" value="{$frontendpassword}">
+            </div>
+            </fieldset>
+            <input type="hidden" name="formname"        value="createmysqlaccount" />
+            <input type="hidden" name="dbname"          value="{$dbname}" />
+            <input type="hidden" name="dbhost"          value="{$dbhost}" />
+            <input type="hidden" name="dbadminuser"     value="{$dbadminuser}" />
+            <input type="hidden" name="dbadminpassword" value="{$dbadminpassword}" />
+            <div>
+                <input type="submit" />
+            </div>
+        </form>
+    {elseif $Page == "Done"}
+        {if $configfile}
+            <h2>Congratulations! You're done</h2>
+            <p>Wrote LORIS config file to {$configfile}.</p>
+        {else}
+            <h2>Almost done!</h2>
+            <p>The LORIS username was configured, but the web server
+               wasn't able to write to the file {$configlocation}.</p>
+            <p>Please copy and paste the following into that file
+               on the server in which this web server is running or
+               contact your system administer for help:</p>
+            <div>
+                <code><pre>{$configcontent}</pre></code>
+            </div>
+        {/if}
+            <p>
+              {if $configfile}
+                You should now be able to
+              {else}
+                After that you should be able to
+              {/if} access LORIS by visiting
+              <a href="{$lorisurl}">{$lorisurl}</a> and logging in
+              with the front end admin username and password you
+              configured on the previous page.
+            </p>
+    {else}
+        {* Default Page *}
+        <p>Welcome to the LORIS installer.</p>
+        <p>This module is the last step in installing LORIS, before
+        proceeding to do your study configuration.</p>
+        <p>This installer will set up the default users, create the SQL
+        database and load the LORIS database schema, set up some basic
+        server configuration, and reset the default LORIS username and
+        password.
+        <p>In order to proceed you'll need the following information:
+        <ul>
+            <li style="padding: 5px">
+                A MySQL hostname that you'll be installing
+                LORIS on, which is accessible from this server.
+            </li>
+            <li style="padding: 5px">
+                A MySQL username and password on that server which
+                has permissions to create databases, tables, and users
+                unless the database, tables and/or users already exists
+
+                This user shoud have <strong>ALL</strong> privileges granted for the database specified.
+                <br/>
+                * <i>This username and password will not be saved, but is
+                only used for installing LORIS.</i>
+            </li>
+            <li style="padding: 5px">
+                The database name for LORIS to use. It's best to name
+                your databases after the project being hosted, but if
+                you're unsure it's safe to use the default value of
+                "LORIS". This database must <strong>not</strong> already
+                exist in MySQL.
+            </li>
+        </ul></p>
+        <p>Let's get started.</p>
+        <form method="post">
+            <fieldset>
+                <legend>MySQL Connection Information</legend>
+            <div>
+                <div class="col-md-2">
+                    <label for="serverhost">Server Hostname:</label>
+                </div>
+                <div class="col-md-10">
+                    <input id="serverhost" value="{$dbhost}" type="text" name="dbhost" placeholder="ie. localhost">
+                </div>
+            </div>
+            <div>
+                <div class="col-md-2">
+                    <label for="serveruser">Admin Username:</label>
+                </div>
+                <div class="col-md-10">
+                    <input id="serveruser" value="{$dbadminuser}" name="dbadminuser" type="text" placeholder="ie. root">
+                </div>
+            </div>
+            <div>
+                <div class="col-md-2">
+                    <label for="serverpassword">Admin Password:</label>
+                </div>
+                <div class="col-md-10">
+                    <input id="serverpassword" value="{$dbadminpassword}" type="password" name="dbadminpassword" placeholder="ie. LORISISTHEBEST!!!1">
+                </div>
+            </div>
+            <div>
+                <div class="col-md-2">
+                    <label for="dbname">Database name:</label>
+                </div>
+                <div class="col-md-10">
+                    <input id="dbname" value="{if $dbname}{$dbname}{else}LORIS{/if}" type="text" name="dbname">
+                </div>
+            </div>
+            </fieldset>
+            <fieldset>
+                <legend>Options</legend>
+            <div>
+                <div class="col-md-2">
+                    <label for="use_existing_database">Use existing database:</label>
+                </div>
+                <div class="col-md-9">
+                    <input type="checkbox" id="use_existing_database" name="use_existing_database" value="on" {($use_existing_database == 'on') ? 'checked' : ''}/>
+                                        Check this if the database already exists but does not have Loris installed yet
+                </div>
+            </div>
+            <div>
+                <div class="col-md-2">
+                    <label for="use_existing_tables">Use existing tables:</label>
+                </div>
+                <div class="col-md-10">
+                    <input type="checkbox" id="use_existing_tables" name="use_existing_tables" value="on" {($use_existing_tables == 'on') ? 'checked' : ''}/>
+                                        Check this if you already installed Loris at the specified database
+                </div>
+            </div>
+            <div>
+                <div class="col-md-2">
+                    <label for="use_existing_configs">Use existing configs:</label>
+                </div>
+                <div class="col-md-10">
+                    <input type="checkbox" id="use_existing_configs" name="use_existing_configs" value="on" {($do_not_update_config == 'on') ? 'checked' : ''}/>
+                                        Check this if you don't want to update the configuration.
+                                    <em>(You really should update the configuration if possible, though)</em>
+                </div>
+            </div>
+            </fieldset>
+            <input type="hidden" name="formname" value="validaterootaccount" />
+<hr/>
+            <div class="col-md-12">
+                <input class="btn btn-submit btn-default" type="submit" />
+            </div>
+        </form>
+    {/if}
+    </div>
     </div>
-	</div>
     </body>
 </html>
diff --git a/smarty/templates/main.tpl b/smarty/templates/main.tpl
index 4c037640c60..08b34e249ce 100644
--- a/smarty/templates/main.tpl
+++ b/smarty/templates/main.tpl
@@ -475,7 +475,7 @@
                     </ul>
                 </center>
                 <div align="center" colspan="1">
-                    Powered by LORIS version {$version} &copy; {$currentyear}. All rights reserved.
+                    Powered by LORIS &copy; {$currentyear}. All rights reserved.
                 </div>
       		<div align="center" colspan="1">
                     Created by <a href="http://mcin-cnim.ca/" target="_blank">
diff --git a/smarty/templates/public_layout.tpl b/smarty/templates/public_layout.tpl
index a83e8794375..5df49a2fbf0 100644
--- a/smarty/templates/public_layout.tpl
+++ b/smarty/templates/public_layout.tpl
@@ -47,7 +47,7 @@
 
   <footer class="footer">
     Powered by <a href="http://www.loris.ca/" target="_blank">LORIS</a>
-    {$version} | GPL-3.0 &copy; {$currentyear} <br/>
+    | GPL-3.0 &copy; {$currentyear} <br/>
     Developed at
     <a href="http://www.mni.mcgill.ca" target="_blank">
       Montreal Neurological Institute and Hospital
diff --git a/src/Http/EmptyStream.php b/src/Http/EmptyStream.php
index 257ee55c05e..df82a0389d9 100644
--- a/src/Http/EmptyStream.php
+++ b/src/Http/EmptyStream.php
@@ -57,10 +57,11 @@ public function close()
     /**
      * Stub to implements PSR7 StreamInterface. No-op
      *
-     * @return void
+     * @return null
      */
     public function detach()
     {
+        return null;
     }
 
     /**
@@ -141,11 +142,11 @@ public function isWritable()
      *
      * @param string $string The string to write to the stream
      *
-     * @return void
+     * @return int The number of bytes written (always 0)
      */
-    public function write($string)
+    public function write($string) : int
     {
-        return;
+        return 0;
     }
 
     /**
diff --git a/test/RBdata.sql b/test/RBdata.sql
index b023dbf5020..9a6a758047e 100644
--- a/test/RBdata.sql
+++ b/test/RBdata.sql
@@ -1497,18 +1497,16 @@ UNLOCK TABLES;
 
 
 DELETE FROM `ImagingFileTypes`;
-INSERT INTO `ImagingFileTypes` (type)  VALUES
-      ('mnc'),
-      ('obj'),
-      ('xfm'),
-      ('xfmmnc'),
-      ('imp'),
-      ('vertstat'),
-      ('xml'),
-      ('txt'),
-      ('nii'),
-      ('nii.gz'),
-      ('nrrd');
+INSERT INTO `ImagingFileTypes` (type, description) VALUES
+  ('mnc',      'MINC file'),
+  ('obj',      'MNI BIC imaging format for a surface'),
+  ('xfm',      'MNI BIC linear transformation matrix file'),
+  ('vertstat', 'MNI BIC imaging format for a field on a surface (e.g. cortical thickness)'),
+  ('xml',      'XML file'),
+  ('txt',      'text file'),
+  ('nii',      'NIfTI file'),
+  ('nrrd',     'NRRD file format (used by DTIPrep)'),
+  ('grid_0',   'MNI BIC non-linear field for non-linear transformation');
 
 SET @OLD_SQL_MODE=@@SQL_MODE;
 SET SQL_MODE='NO_AUTO_VALUE_ON_ZERO';
@@ -1996,7 +1994,7 @@ UNLOCK TABLES;
 LOCK TABLES `media` WRITE;
 DELETE FROM `media`;
 /*!40000 ALTER TABLE `media` DISABLE KEYS */;
-INSERT INTO `media` (id,session_id,instrument,date_taken,comments,file_name,file_type,data_dir,uploaded_by,hide_file,date_uploaded) VALUES (1,2,NULL,'1001-01-01',NULL,'MTL002_V1.py','text/x-python-script','/data/uploads/','admin',0,'2016-08-11 14:10:57'),(2,2,NULL,'2016-12-31',NULL,'MTL002_V1.txt','text/plain','/data/uploads/','admin',0,'2016-08-11 14:06:43'),(3,181,NULL,NULL,NULL,'OTT181_V1.txt','text/plain','/data/uploads/','admin',0,'2016-08-15 14:21:15'),(4,1216,NULL,NULL,NULL,'OTT181_V2.txt','text/plain','/data/uploads/','admin',0,'2016-08-15 14:24:34'),(5,10,NULL,NULL,NULL,'MTL010_V1.txt','text/plain','/data/uploads/','admin',0,'2016-08-16 17:04:07'),(6,13,NULL,NULL,NULL,'MTL013_V1.txt','text/plain','/data/uploads/','admin',0,'2016-08-16 17:04:33'),(7,18,NULL,NULL,NULL,'MTL018_V1.txt','text/plain','/data/uploads/','admin',0,'2016-08-16 17:05:08'),(8,20,NULL,NULL,NULL,'MTL020_V1.txt','text/plain','/data/uploads/','admin',0,'2016-08-16 17:05:28'),(9,30,NULL,NULL,NULL,'MTL030_V1.txt','text/plain','/data/uploads/','admin',0,'2016-08-16 17:06:15'),(10,31,NULL,NULL,NULL,'MTL031_V1.txt','text/plain','/data/uploads/','admin',0,'2016-08-16 17:06:32'),(11,48,NULL,NULL,NULL,'MTL048_V1.txt','text/plain','/data/uploads/','admin',0,'2016-08-16 17:06:46'),(12,61,NULL,NULL,NULL,'MTL061_V1.txt','text/plain','/data/uploads/','admin',0,'2016-08-16 17:07:08'),(13,68,NULL,NULL,NULL,'MTL068_V1.txt','text/plain','/data/uploads/','admin',0,'2016-08-16 17:07:25'),(14,95,NULL,NULL,NULL,'MTL095_V1.txt','text/plain','/data/uploads/','admin',0,'2016-08-16 17:07:46'),(15,1079,NULL,NULL,NULL,'OTT187_V3.txt','text/plain','/data/uploads/','admin',0,'2016-08-16 17:08:08'),(16,1912,NULL,NULL,NULL,'OTT188_V2.txt','text/plain','/data/uploads/','admin',0,'2016-08-16 17:08:49'),(17,192,'bmi',NULL,NULL,'OTT192_V1_bmi.txt','text/plain','/data/uploads/','admin',0,'2016-08-16 17:09:13'),(18,260,NULL,'2016-05-05',NULL,'OTT260_V1.txt','text/plain','/data/uploads/','admin',0,'2016-08-16 17:09:47'),(19,285,'bmi',NULL,NULL,'OTT285_V1_bmi.txt','text/plain','/data/uploads/','admin',0,'2016-08-16 17:10:24'),(20,311,'bmi','2016-06-05',NULL,'OTT311_V1_bmi.txt','text/plain','/data/uploads/','admin',0,'2016-08-16 17:11:11'),(21,323,NULL,NULL,NULL,'OTT323_V1.txt','text/plain','/data/uploads/','admin',0,'2016-08-16 17:11:34'),(22,324,NULL,NULL,NULL,'OTT324_V1.txt','text/plain','/data/uploads/','admin',0,'2016-08-16 17:11:50'),(23,1359,NULL,NULL,NULL,'ROM474_V2.txt','text/plain','/data/uploads/','admin',0,'2016-08-16 17:12:33'),(24,854,NULL,NULL,NULL,'ROM474_V3.txt','text/plain','/data/uploads/','admin',0,'2016-08-16 17:12:50'),(25,862,NULL,NULL,NULL,'ROM482_V6.txt','text/plain','/data/uploads/','admin',0,'2016-08-16 17:13:13'),(26,1257,'medical_history',NULL,NULL,'ROM489_V3_medical_history.txt','text/plain','/data/uploads/','admin',0,'2016-08-16 17:13:31');
+INSERT INTO `media` (id, session_id, instrument, date_taken, comments, file_name, file_type, data_dir, uploaded_by, hide_file, date_uploaded) VALUES (1,2,NULL,'1001-01-01',NULL,'MTL002_V1.py','text/x-python-script','/data/uploads/','admin',0,'2016-08-11 14:10:57'),(2,2,NULL,'2016-12-31',NULL,'MTL002_V1.txt','text/plain','/data/uploads/','admin',0,'2016-08-11 14:06:43'),(3,181,NULL,NULL,NULL,'OTT181_V1.txt','text/plain','/data/uploads/','admin',0,'2016-08-15 14:21:15'),(4,1216,NULL,NULL,NULL,'OTT181_V2.txt','text/plain','/data/uploads/','admin',0,'2016-08-15 14:24:34'),(5,10,NULL,NULL,NULL,'MTL010_V1.txt','text/plain','/data/uploads/','admin',0,'2016-08-16 17:04:07'),(6,13,NULL,NULL,NULL,'MTL013_V1.txt','text/plain','/data/uploads/','admin',0,'2016-08-16 17:04:33'),(7,18,NULL,NULL,NULL,'MTL018_V1.txt','text/plain','/data/uploads/','admin',0,'2016-08-16 17:05:08'),(8,20,NULL,NULL,NULL,'MTL020_V1.txt','text/plain','/data/uploads/','admin',0,'2016-08-16 17:05:28'),(9,30,NULL,NULL,NULL,'MTL030_V1.txt','text/plain','/data/uploads/','admin',0,'2016-08-16 17:06:15'),(10,31,NULL,NULL,NULL,'MTL031_V1.txt','text/plain','/data/uploads/','admin',0,'2016-08-16 17:06:32'),(11,48,NULL,NULL,NULL,'MTL048_V1.txt','text/plain','/data/uploads/','admin',0,'2016-08-16 17:06:46'),(12,61,NULL,NULL,NULL,'MTL061_V1.txt','text/plain','/data/uploads/','admin',0,'2016-08-16 17:07:08'),(13,68,NULL,NULL,NULL,'MTL068_V1.txt','text/plain','/data/uploads/','admin',0,'2016-08-16 17:07:25'),(14,95,NULL,NULL,NULL,'MTL095_V1.txt','text/plain','/data/uploads/','admin',0,'2016-08-16 17:07:46'),(15,1079,NULL,NULL,NULL,'OTT187_V3.txt','text/plain','/data/uploads/','admin',0,'2016-08-16 17:08:08'),(16,1912,NULL,NULL,NULL,'OTT188_V2.txt','text/plain','/data/uploads/','admin',0,'2016-08-16 17:08:49'),(17,192,'bmi',NULL,NULL,'OTT192_V1_bmi.txt','text/plain','/data/uploads/','admin',0,'2016-08-16 17:09:13'),(18,260,NULL,'2016-05-05',NULL,'OTT260_V1.txt','text/plain','/data/uploads/','admin',0,'2016-08-16 17:09:47'),(19,285,'bmi',NULL,NULL,'OTT285_V1_bmi.txt','text/plain','/data/uploads/','admin',0,'2016-08-16 17:10:24'),(20,311,'bmi','2016-06-05',NULL,'OTT311_V1_bmi.txt','text/plain','/data/uploads/','admin',0,'2016-08-16 17:11:11'),(21,323,NULL,NULL,NULL,'OTT323_V1.txt','text/plain','/data/uploads/','admin',0,'2016-08-16 17:11:34'),(22,324,NULL,NULL,NULL,'OTT324_V1.txt','text/plain','/data/uploads/','admin',0,'2016-08-16 17:11:50'),(23,1359,NULL,NULL,NULL,'ROM474_V2.txt','text/plain','/data/uploads/','admin',0,'2016-08-16 17:12:33'),(24,854,NULL,NULL,NULL,'ROM474_V3.txt','text/plain','/data/uploads/','admin',0,'2016-08-16 17:12:50'),(25,862,NULL,NULL,NULL,'ROM482_V6.txt','text/plain','/data/uploads/','admin',0,'2016-08-16 17:13:13'),(26,1257,'medical_history',NULL,NULL,'ROM489_V3_medical_history.txt','text/plain','/data/uploads/','admin',0,'2016-08-16 17:13:31');
 /*!40000 ALTER TABLE `media` ENABLE KEYS */;
 UNLOCK TABLES;
 
diff --git a/test/config.xml b/test/config.xml
index 362219e7e59..6db999ed863 100644
--- a/test/config.xml
+++ b/test/config.xml
@@ -56,28 +56,12 @@
         </HeaderTable>
         <!-- defines how visit labels are assigned -->
         <visitLabel subprojectID="1">
-            <!-- generation can have either 'user' or 'sequence' to denote user entered or a pre-defined sequence -->
-            <!-- if 'user', the frontend will display a textbox for the user to enter date which is
-                 enforced against the regex. If 'sequence', a dropdown will be displayed
-                 based on the options in the labelSet tag -->
-            <generation>user</generation>
-            <regex>/^[A-Z0-9]{2}$/i</regex>
-            <length>2</length>
-            <suggest>V%value%</suggest> <!-- %value% will be substituted for the next unique number -->
             <labelSet>
                 <item value="V01">V01</item>
                 <item value="V02">V02</item>
             </labelSet>
         </visitLabel>
         <visitLabel subprojectID="2">
-            <!-- generation can have either 'user' or 'sequence' to denote user entered or a pre-defined sequence -->
-            <!-- if 'user', the frontend will display a textbox for the user to enter date which is
-                 enforced against the regex. If 'sequence', a dropdown will be displayed
-                 based on the options in the labelSet tag -->
-            <generation>user</generation>
-            <regex>/^[A-Z0-9]{2}$/i</regex>
-            <length>2</length>
-            <suggest>V%value%</suggest> <!-- %value% will be substituted for the next unique number -->
             <labelSet>
                 <item value="V01">V01</item>
                 <item value="V02">V02</item>
diff --git a/test/integrationtests/LorisIntegrationTest.class.inc b/test/integrationtests/LorisIntegrationTest.class.inc
index 783b068cdd5..6b43875dc30 100644
--- a/test/integrationtests/LorisIntegrationTest.class.inc
+++ b/test/integrationtests/LorisIntegrationTest.class.inc
@@ -43,7 +43,7 @@ abstract class LorisIntegrationTest extends TestCase
      * instantiting the config and database objects, creating a user
      * to user for the tests, and logging in.
      *
-     * @return none
+     * @return void
      */
     public function setUp()
     {
@@ -111,7 +111,7 @@ abstract class LorisIntegrationTest extends TestCase
 
         $this->login("UnitTester", "4test4");
 
-        if (extension_loaded('xdebug')) {
+        if (extension_loaded('xdebug') && function_exists("xdebug_start_code_coverage")) {
             xdebug_start_code_coverage(XDEBUG_CC_UNUSED | XDEBUG_CC_DEAD_CODE);
         }
 
@@ -124,7 +124,7 @@ abstract class LorisIntegrationTest extends TestCase
      * @param string $username The username to log in as
      * @param string $password The (plain text) password to login as.
      *
-     * @return none, side-effect logs in active webDriver
+     * @return void but side-effect logs in active webDriver
      */
     protected function login($username, $password)
     {
@@ -160,7 +160,7 @@ abstract class LorisIntegrationTest extends TestCase
      * its permissions. user_login_history also must be purged as it contains a
      * foreign key to users
      *
-     * @return none
+     * @return void
      */
     public function tearDown()
     {
@@ -190,7 +190,7 @@ abstract class LorisIntegrationTest extends TestCase
      *
      * @throws LorisException
      *
-     * @return none
+     * @return void
      */
     function setupConfigSetting($configName, $value)
     {
@@ -235,7 +235,7 @@ abstract class LorisIntegrationTest extends TestCase
      *
      * @throws LorisException
      *
-     * @return none
+     * @return void
      */
     function restoreConfigSetting($configName)
     {
@@ -260,7 +260,7 @@ abstract class LorisIntegrationTest extends TestCase
      *
      * @param array $permissions List of permissions codes to add TestUser
      *
-     * @return none
+     * @return void
      */
     function setupPermissions($permissions)
     {
@@ -284,7 +284,7 @@ abstract class LorisIntegrationTest extends TestCase
      * Helper function to reset user permissions. The function works by adding
      * all permissions to the TestUser.
      *
-     * @return none
+     * @return void
      */
     function resetPermissions()
     {
@@ -296,7 +296,7 @@ abstract class LorisIntegrationTest extends TestCase
     /**
      * Helper function to change the users Study Site
      *
-     * @return none
+     * @return void
      */
     function changeStudySite()
     {
@@ -307,7 +307,7 @@ abstract class LorisIntegrationTest extends TestCase
     /**
      * Helper function to reset the users Study Site
      *
-     * @return none
+     * @return void
      */
     function resetStudySite()
     {
@@ -320,7 +320,7 @@ abstract class LorisIntegrationTest extends TestCase
      *
      * @param string $title Name of the subproject
      *
-     * @return none
+     * @return void
      */
     function createSubproject($SubprojectID,$title)
     {
@@ -340,7 +340,7 @@ abstract class LorisIntegrationTest extends TestCase
      *
      * @param string $title Name of the subproject
      *
-     * @return none
+     * @return void
      */
     function deleteSubproject($title)
     {
@@ -390,7 +390,7 @@ abstract class LorisIntegrationTest extends TestCase
      *
      * @param string $pscid The PSCID of teh candiate to delete
      *
-     * @return none
+     * @return void
      */
     function deleteCandidate($pscid)
     {
@@ -502,12 +502,12 @@ abstract class LorisIntegrationTest extends TestCase
      * @throws ElementNotVisibleException if $allowJavascriptClick is false and the
      *                                    element cannot be clicked on because it is
      *                                    not visible.
-     * @throws StaleElementReferenceExceptoin if $allowJavascriptClick is false and
+     * @throws StaleElementReferenceException if $allowJavascriptClick is false and
      *                                        the element cannot be clicked on
      *                                        because the DOM was updated since the
      *                                        element was found.
      *
-     * @return void.
+     * @return void
      */
     function safeClick(WebDriverBy $by, $waitPeriod=15, $allowJavascriptClick=true)
     {
@@ -518,7 +518,7 @@ abstract class LorisIntegrationTest extends TestCase
             $clickException = null;
         } catch(ElementNotVisibleException $e) {
             $clickException = $e;
-        } catch(StaleElementReferenceExceptoin $e) {
+        } catch(StaleElementReferenceException $e) {
             $clickException = $e;
         }
 
diff --git a/test/integrationtests/LorisIntegrationTestWithCandidate.class.inc b/test/integrationtests/LorisIntegrationTestWithCandidate.class.inc
index 7a203c20c84..d0754893f79 100644
--- a/test/integrationtests/LorisIntegrationTestWithCandidate.class.inc
+++ b/test/integrationtests/LorisIntegrationTestWithCandidate.class.inc
@@ -37,7 +37,7 @@ abstract class LorisIntegrationTestWithCandidate extends LorisIntegrationTest
      * to user for the tests, and logging in, and creating a candidate
      * with a session
      *
-     * @return none
+     * @return void
      */
     public function setUp()
     {
diff --git a/test/unittests/CandidateTest.php b/test/unittests/CandidateTest.php
index b77f1951561..8a7a7f4947e 100644
--- a/test/unittests/CandidateTest.php
+++ b/test/unittests/CandidateTest.php
@@ -283,119 +283,6 @@ public function testGetListOfVisitLabels()
 
     }
 
-    /**
-     * Test getNextVisitLabel returns the next label
-     *
-     * @covers Candidate::getNextVisitLabel
-     * @return void
-     */
-    public function testGetNextVisitLabelReturnsNextLabel()
-    {
-        //set config 'visitLabel' values
-        $this->_configMap[] = array(
-                               'visitLabel',
-                               array(
-                                'generation' => 'user',
-                                'suggest'    => 'V%value%',
-                               ),
-                              );
-        $this->_setUpTestDoublesForSelectCandidate();
-
-        $existingVisitLabels = array(
-                                array(
-                                 'ID'          => '97',
-                                 'Visit_label' => 'V01',
-                                ),
-                                array(
-                                 'ID'          => '98',
-                                 'Visit_label' => 'V02',
-                                ),
-                               );
-
-        //mock pselect() from getListOfVisitLabels
-        $this->_dbMock->expects($this->at(2))
-            ->method('pselect')
-            ->with(
-                $this->stringStartsWith('SELECT ID, Visit_label FROM session'),
-                $this->arrayHasKey('Candidate')
-            )
-            ->willReturn($existingVisitLabels);
-
-        //mock pselectRow from getNextVisitLabel
-        $this->_dbMock->expects($this->at(3))
-            ->method('pselectRow')
-            ->with(
-                $this->stringStartsWith(
-                    'SELECT IFNULL(max(VisitNo)+1, 1) AS nextVisitLabel'
-                )
-            )
-            ->willReturn(array('nextVisitLabel' => '3'));
-
-        $this->_candidate->select(969664);
-        $this->assertEquals('V3', $this->_candidate->getNextVisitLabel());
-    }
-
-
-    /**
-     * Test getNextVisitLabel returns 1st visit label
-     * when there are no existing visit labels
-     *
-     * @covers Candidate::getNextVisitLabel
-     * @return void
-     */
-    public function testGetNextVisitLabelWhenThereAreNoExistingVisitLabels()
-    {
-        $this->_listOfTimePoints = array();
-        //set config 'visitLabel' values
-        $this->_configMap[] = array(
-                               'visitLabel',
-                               array(
-                                'generation' => 'user',
-                                'suggest'    => 'V%value%',
-                               ),
-                              );
-        $this->_setUpTestDoublesForSelectCandidate();
-
-        $existingVisitLabels = array();
-
-        //mock pselect from getListOfVisitLabels
-        $this->_dbMock->expects($this->at(2))
-            ->method('pselect')
-            ->with(
-                $this->stringStartsWith('SELECT ID, Visit_label FROM session'),
-                $this->arrayHasKey('Candidate')
-            )
-            ->willReturn($existingVisitLabels);
-
-        //mock pselectRow from getNextVisitLabel
-        $this->_dbMock->expects($this->at(3))
-            ->method('pselectRow')
-            ->with(
-                $this->stringStartsWith(
-                    'SELECT IFNULL(max(VisitNo)+1, 1) AS nextVisitLabel'
-                )
-            )
-            ->willReturn(false);
-
-        $this->_candidate->select(969664);
-        $this->assertEquals('V1', $this->_candidate->getNextVisitLabel());
-    }
-
-    /**
-     * Test getNextVisitLabel returns null when no 'visitLabel'
-     * settings are present in config.xml
-     *
-     * @covers Candidate::getNextVisitLabel
-     * @return void
-     */
-    public function testGetNextVisitLabelWhenNoVisitLabelSettingInConfig()
-    {
-        $this->_setUpTestDoublesForSelectCandidate();
-        $this->_candidate->select(969664);
-
-        $this->assertNull($this->_candidate->getNextVisitLabel());
-    }
-
     /**
      * Test Candidate::getValidSubprojects returns a list
      * of valid subprojects for a specific project
diff --git a/test/unittests/LorisForms_Test.php b/test/unittests/LorisForms_Test.php
index b458eb6c2aa..79a9db0f735 100644
--- a/test/unittests/LorisForms_Test.php
+++ b/test/unittests/LorisForms_Test.php
@@ -30,7 +30,7 @@ class LorisForms_Test extends TestCase
     /**
      * Creates a new LorisForm to use for testing
      *
-     * @return none
+     * @return void
      */
     function setUp()
     {
@@ -45,7 +45,7 @@ function setUp()
      * @param string $type The expected type of this element
      *                     (ie select, checkbox, etc)
      *
-     * @return none, but makes assertions
+     * @return void but makes assertions
      */
     function assertType($el, $type)
     {
@@ -68,7 +68,7 @@ function assertType($el, $type)
      * @param string $label The expected type of this element
      *                      (ie select, checkbox, etc)
      *
-     * @return none, but makes assertions
+     * @return void but makes assertions
      */
     function assertLabel($el, $label)
     {
@@ -88,7 +88,7 @@ function assertLabel($el, $label)
      * Test that the addSelect wrapper adds an element of the appropriate
      * type to the page
      *
-     * @return none
+     * @return void
      */
     function testAddSelect()
     {
@@ -103,7 +103,7 @@ function testAddSelect()
      * Test that the addSelect wrapper adds an element of the appropriate
      * type to the page
      *
-     * @return none
+     * @return void
      */
     function testAddMultiSelect()
     {
@@ -131,7 +131,7 @@ function testAddMultiSelect()
      * Test that the addText wrapper adds an element of the appropriate
      * type to the page
      *
-     * @return none
+     * @return void
      */
     function testAddText()
     {
@@ -144,7 +144,7 @@ function testAddText()
      * Test that the addDate wrapper adds an element of the appropriate
      * type to the page
      *
-     * @return none
+     * @return void
      */
     function testAddDate()
     {
@@ -158,7 +158,7 @@ function testAddDate()
      * Test that the addDate wrapper adds an element of the appropriate
      * type to the page
      *
-     * @return none
+     * @return void
      */
     function testAddFile()
     {
@@ -172,7 +172,7 @@ function testAddFile()
      * Test that the addDate wrapper adds an element of the appropriate
      * type to the page
      *
-     * @return none
+     * @return void
      */
     function testAddPassword()
     {
@@ -186,7 +186,7 @@ function testAddPassword()
      * Test that the addElement wrapper with type "select" adds an element of
      * the appropriate type to the page
      *
-     * @return none
+     * @return void
      */
     function testAddElementSelect()
     {
@@ -202,7 +202,7 @@ function testAddElementSelect()
      * Test that the addElement wrapper with type "date" adds an element of
      * the appropriate type to the page
      *
-     * @return none
+     * @return void
      */
     function testAddElementDate()
     {
@@ -218,7 +218,7 @@ function testAddElementDate()
      * Test that the addElement wrapper with type "text" adds an element of
      * the appropriate type to the page
      *
-     * @return none
+     * @return void
      */
     function testAddElementText()
     {
@@ -234,7 +234,7 @@ function testAddElementText()
      * Test that the addElement wrapper with type "text" adds an element of
      * the appropriate type to the page
      *
-     * @return none
+     * @return void
      */
     function testAddElementFile()
     {
@@ -250,7 +250,7 @@ function testAddElementFile()
      * Test that the addElement wrapper with type "password" adds an element of
      * the appropriate type to the page
      *
-     * @return none
+     * @return void
      */
     function testAddElementPassword()
     {
diff --git a/test/unittests/Loris_PHPUnit_Database_TestCase.php b/test/unittests/Loris_PHPUnit_Database_TestCase.php
index 0f1ff5fd0f9..98a5675f957 100644
--- a/test/unittests/Loris_PHPUnit_Database_TestCase.php
+++ b/test/unittests/Loris_PHPUnit_Database_TestCase.php
@@ -32,7 +32,7 @@ abstract class Loris_PHPUnit_Database_TestCase extends TestCase
      *
      * Only instantiate _pdo once for test clean-up/fixture load
      *
-     * @var PDO
+     * @var \PDO
      */
     static private $_pdo = null;
 
@@ -40,7 +40,7 @@ abstract class Loris_PHPUnit_Database_TestCase extends TestCase
      * Note: only instantiate PHPUnit_Extensions_Database_DB_IDatabaseConnection
      * once per test
      *
-     * @var PHPUnit_Extensions_Database_DB_IDatabaseConnection
+     * @var \PHPUnit\DbUnit\Database\Connection
      */
     private $_conn = null;
 
diff --git a/test/unittests/NDB_BVL_FeedbackTest.php b/test/unittests/NDB_BVL_FeedbackTest.php
index 9f717f8138a..6d1b7fc269d 100644
--- a/test/unittests/NDB_BVL_FeedbackTest.php
+++ b/test/unittests/NDB_BVL_FeedbackTest.php
@@ -51,7 +51,7 @@ protected function setUp()
      * Returns test data set.
      * Populates table feedback_bvl_type.
      *
-     * @return PHPUnit_Extensions_Database_DataSet_IDataSet
+     * @return \PHPUnit\DbUnit\DataSet\IDataSet
      */
     protected function getDataSet()
     {
diff --git a/test/unittests/NDB_BVL_Instrument_LINST_ToJSON_Test.php b/test/unittests/NDB_BVL_Instrument_LINST_ToJSON_Test.php
index ede089a858e..4a445b6d7e4 100644
--- a/test/unittests/NDB_BVL_Instrument_LINST_ToJSON_Test.php
+++ b/test/unittests/NDB_BVL_Instrument_LINST_ToJSON_Test.php
@@ -19,7 +19,7 @@ function setUp() {
             define("UNIT_TESTING", true);
         }
         date_default_timezone_set("UTC");
-        $this->Session = $this->getMockBuilder(stdClass::class)->setMethods(array('getProperty', 'setProperty', 'getUsername', 'isLoggedIn'))->getMock();
+        $this->Session = $this->getMockBuilder(\stdClass::class)->setMethods(array('getProperty', 'setProperty', 'getUsername', 'isLoggedIn'))->getMock();
         $this->MockSinglePointLogin = $this->getMockBuilder('SinglePointLogin')->getMock();
         $this->Session->method("getProperty")->willReturn($this->MockSinglePointLogin);
 
diff --git a/test/unittests/NDB_BVL_Instrument_ToJSON_Test.php b/test/unittests/NDB_BVL_Instrument_ToJSON_Test.php
index 50b772ab514..bf729cc40cc 100644
--- a/test/unittests/NDB_BVL_Instrument_ToJSON_Test.php
+++ b/test/unittests/NDB_BVL_Instrument_ToJSON_Test.php
@@ -19,7 +19,7 @@ function setUp() {
             define("UNIT_TESTING", true);
         }
         date_default_timezone_set("UTC");
-        $this->Session = $this->getMockBuilder(stdClass::class)->setMethods(array('getProperty', 'setProperty', 'getUsername', 'isLoggedIn'))->getMock();
+        $this->Session = $this->getMockBuilder(\stdClass::class)->setMethods(array('getProperty', 'setProperty', 'getUsername', 'isLoggedIn'))->getMock();
         $this->MockSinglePointLogin = $this->getMockBuilder('SinglePointLogin')->getMock();
         $this->Session->method("getProperty")->willReturn($this->MockSinglePointLogin);
 
diff --git a/test/unittests/api/v0.0.1/NDB_BVL_Instrument_test.php b/test/unittests/api/v0.0.1/NDB_BVL_Instrument_test.php
index 43852ddded5..c9f70d3b71d 100644
--- a/test/unittests/api/v0.0.1/NDB_BVL_Instrument_test.php
+++ b/test/unittests/api/v0.0.1/NDB_BVL_Instrument_test.php
@@ -10,6 +10,7 @@ function __construct() {
         }
 
         function save() {
+            return true;
         }
 
         function _hasAccess() {
diff --git a/tools/CouchDB_Confirm_Integrity.php b/tools/CouchDB_Confirm_Integrity.php
index 044e0f34069..4a1a26764ce 100644
--- a/tools/CouchDB_Confirm_Integrity.php
+++ b/tools/CouchDB_Confirm_Integrity.php
@@ -48,8 +48,17 @@ class CouchDBIntegrityChecker
      */
     function __construct()
     {
-        $this->SQLDB   = \Database::singleton();
-        $this->CouchDB = \NDB_Factory::singleton()->couchDB();
+        $factory       = \NDB_Factory::singleton();
+        $config        = \NDB_Config::singleton();
+        $couchConfig   = $config->getSetting('CouchDB');
+        $this->SQLDB   = $factory->Database();
+        $this->CouchDB = $factory->couchDB(
+            $couchConfig['dbName'],
+            $couchConfig['hostname'],
+            $couchConfig['port'],
+            $couchConfig['admin'],
+            $couchConfig['adminpass']
+        );
     }
 
     /**
diff --git a/tools/CouchDB_Import_Demographics.php b/tools/CouchDB_Import_Demographics.php
index 16ed2670345..45a6ee2752a 100644
--- a/tools/CouchDB_Import_Demographics.php
+++ b/tools/CouchDB_Import_Demographics.php
@@ -101,8 +101,17 @@ class CouchDBDemographicsImporter {
     );
 
     function __construct() {
-        $this->SQLDB = \Database::singleton();
-        $this->CouchDB = \NDB_Factory::singleton()->couchDB();
+        $factory       = \NDB_Factory::singleton();
+        $config        = \NDB_Config::singleton();
+        $couchConfig   = $config->getSetting('CouchDB');
+        $this->SQLDB   = $factory->Database();
+        $this->CouchDB = $factory->couchDB(
+            $couchConfig['dbName'],
+            $couchConfig['hostname'],
+            $couchConfig['port'],
+            $couchConfig['admin'],
+            $couchConfig['adminpass']
+        );
     }
 
     function _getSubproject($id) {
diff --git a/tools/CouchDB_Import_Instruments.php b/tools/CouchDB_Import_Instruments.php
index 1f9a97474ac..e06a9e8e1e9 100644
--- a/tools/CouchDB_Import_Instruments.php
+++ b/tools/CouchDB_Import_Instruments.php
@@ -12,8 +12,17 @@ class CouchDBInstrumentImporter
 
     function __construct()
     {
-        $this->SQLDB   = \Database::singleton();
-        $this->CouchDB = \NDB_Factory::singleton()->couchDB();
+        $factory       = \NDB_Factory::singleton();
+        $config        = \NDB_Config::singleton();
+        $couchConfig   = $config->getSetting('CouchDB');
+        $this->SQLDB   = $factory->Database();
+        $this->CouchDB = $factory->couchDB(
+            $couchConfig['dbName'],
+            $couchConfig['hostname'],
+            $couchConfig['port'],
+            $couchConfig['admin'],
+            $couchConfig['adminpass']
+        );
     }
 
     function UpdateDataDicts($Instruments)
diff --git a/tools/CouchDB_Import_RadiologicalReview.php b/tools/CouchDB_Import_RadiologicalReview.php
index 8c0334b1c23..9c9c7efa3a2 100644
--- a/tools/CouchDB_Import_RadiologicalReview.php
+++ b/tools/CouchDB_Import_RadiologicalReview.php
@@ -80,8 +80,17 @@ class CouchDBRadiologicalReviewImporter {
     );
 
     function __construct() {
-        $this->SQLDB   = \Database::singleton();
-        $this->CouchDB = \NDB_Factory::singleton()->couchDB();
+        $factory       = \NDB_Factory::singleton();
+        $config        = \NDB_Config::singleton();
+        $couchConfig   = $config->getSetting('CouchDB');
+        $this->SQLDB   = $factory->Database();
+        $this->CouchDB = $factory->couchDB(
+            $couchConfig['dbName'],
+            $couchConfig['hostname'],
+            $couchConfig['port'],
+            $couchConfig['admin'],
+            $couchConfig['adminpass']
+        );
     }
 
     function run() {
diff --git a/tools/CouchDB_MRI_Importer.php b/tools/CouchDB_MRI_Importer.php
index c901207ca33..edae0ebf5d9 100644
--- a/tools/CouchDB_MRI_Importer.php
+++ b/tools/CouchDB_MRI_Importer.php
@@ -28,9 +28,17 @@ class CouchDBMRIImporter
      */
     function __construct()
     {
-        $factory       = NDB_Factory::singleton();
+        $factory       = \NDB_Factory::singleton();
+        $config        = \NDB_Config::singleton();
+        $couchConfig   = $config->getSetting('CouchDB');
         $this->SQLDB   = $factory->Database();
-        $this->CouchDB = $factory->couchDB();
+        $this->CouchDB = $factory->couchDB(
+            $couchConfig['dbName'],
+            $couchConfig['hostname'],
+            $couchConfig['port'],
+            $couchConfig['admin'],
+            $couchConfig['adminpass']
+        );
     }
 
     /**
diff --git a/tools/DB_date_zeros_removal.php b/tools/DB_date_zeros_removal.php
index a92df9d841d..98fb16ceca7 100644
--- a/tools/DB_date_zeros_removal.php
+++ b/tools/DB_date_zeros_removal.php
@@ -90,10 +90,10 @@
 
     if ($field['COLUMN_DEFAULT']=='0000-00-00') {
         echo "The script will modify the date schema for TABLE: `".$field['TABLE_NAME']."` FIELD: `".$field['COLUMN_NAME']."` to default to NULL\n";
-        $alters .= "ALTER TABLE ".$db->escape($field['TABLE_NAME'])." MODIFY ".$db->escape($field['COLUMN_NAME'])." ".$field['COLUMN_TYPE']." DEFAULT NULL;\n";
+        $alters .= "ALTER TABLE ".$db->escape($field['TABLE_NAME'])." MODIFY ".$db->escape($field['COLUMN_NAME'])." ".$field['COLUMN_TYPE']." NULL DEFAULT NULL;\n";
     } else if ($field['COLUMN_DEFAULT']=='0000-00-00 00:00:00') {
         echo "The script will modify the date schema for TABLE: `".$field['TABLE_NAME']."` FIELD: `".$field['COLUMN_NAME']."` to default to NULL\n";
-        $alters .= "ALTER TABLE ".$db->escape($field['TABLE_NAME'])." MODIFY ".$db->escape($field['COLUMN_NAME'])." ".$field['COLUMN_TYPE']." DEFAULT NULL;\n";
+        $alters .= "ALTER TABLE ".$db->escape($field['TABLE_NAME'])." MODIFY ".$db->escape($field['COLUMN_NAME'])." ".$field['COLUMN_TYPE']." NULL DEFAULT NULL;\n";
     }
 
 
diff --git a/tools/assign_missing_instruments.php b/tools/assign_missing_instruments.php
index 5ab8b840c8b..78c5d2fb538 100644
--- a/tools/assign_missing_instruments.php
+++ b/tools/assign_missing_instruments.php
@@ -11,12 +11,12 @@
  *     confirm mode -> Actually assigns the instruments found missing in the
  *                     database.
  *
- * Usage: php assign_missing_instrument.php [Visit_label] [confirm]
+ * Usage: php assign_missing_instruments.php [Visit_label] [confirm]
  *
- * Example: php assign_missing_instrument.php 18month
+ * Example: php assign_missing_instruments.php 18month
  * (Will use regular mode and print the missing instruments)
  *
- * Example: php assign_missing_instrument.php 18month confirm
+ * Example: php assign_missing_instruments.php 18month confirm
  * (Will use confirm mode and assign the missing instruments)
  *
  * Note:  As per ... only timepoints in the 'Visit' stage are examined.
diff --git a/tools/delete_candidate.php b/tools/delete_candidate.php
index 631929079de..5ce59425c0d 100644
--- a/tools/delete_candidate.php
+++ b/tools/delete_candidate.php
@@ -94,7 +94,20 @@
         "not exist in the database or is set to Active='N' state.\n\n";
     die();
 }
-
+$entityType = $DB->pselectOne(
+    "SELECT Entity_type 
+      FROM candidate 
+      WHERE CandID = :cid AND PSCID = :pid AND Active ='Y'",
+    array(
+        'cid' => $CandID,
+        'pid' => $PSCID,
+    )
+);
+if ($entityType === "Scanner") {
+    echo "\nThe candidate with CandID : $CandID  and PSCID : $PSCID is a scanner ".
+        "and should not be deleted using this script.\n\n";
+    die();
+}
 /*
  * The switch to execute actions
  */
@@ -121,7 +134,11 @@ function showHelp()
 
     die();
 }
-
+/*
+ * All tables with entries to be deleted here are only those with FOREIGN KEY relations to `candidate`.
+ * All other tables with FOREIGN KEY relations to these tables (second-level relations) should
+ * have actions on delete specified in the database schema
+ */
 function deleteCandidate($CandID, $PSCID, $confirm, $printToSQL, $DB, $output)
 {
 
@@ -169,6 +186,36 @@ function deleteCandidate($CandID, $PSCID, $confirm, $printToSQL, $DB, $output)
     $result = $DB->pselect('SELECT * FROM parameter_candidate WHERE CandID=:cid', array('cid' => $CandID));
     print_r($result);
 
+    // Print SNP_candidate_rel
+    echo "\nSNP_candidate_rel\n";
+    echo "-----------\n";
+    $result = $DB->pselect('SELECT * FROM SNP_candidate_rel WHERE CandID=:cid', array('cid' => $CandID));
+    print_r($result);
+
+    // Print CNV
+    echo "\nCNV\n";
+    echo "-----------\n";
+    $result = $DB->pselect('SELECT * FROM CNV WHERE CandID=:cid', array('cid' => $CandID));
+    print_r($result);
+    
+    // Print genomic_candidate_files_rel
+    echo "\nGenomic Candidate Files Relation\n";
+    echo "-----------\n";
+    $result = $DB->pselect('SELECT * FROM genomic_candidate_files_rel WHERE CandID=:cid', array('cid' => $CandID));
+    print_r($result);
+    
+    // Print genomic_sample_candidate_rel
+    echo "\nGenomic Sample Candidate Relation\n";
+    echo "-----------\n";
+    $result = $DB->pselect('SELECT * FROM genomic_sample_candidate_rel WHERE CandID=:cid', array('cid' => $CandID));
+    print_r($result);
+    
+    // Print issues
+    echo "\nIssues\n";
+    echo "-----------\n";
+    $result = $DB->pselect('SELECT * FROM issues WHERE candID=:cid', array('cid' => $CandID));
+    print_r($result);
+    
     // Print candidate
     echo "\nCandidate\n";
     echo "-----------\n";
@@ -189,6 +236,21 @@ function deleteCandidate($CandID, $PSCID, $confirm, $printToSQL, $DB, $output)
         //delete from parameter_candidate
         $DB->delete("parameter_candidate", array("CandID" => $CandID));
 
+        //delete from SNP_candidate_rel
+        $result = $DB->delete("SNP_candidate_rel", array("CandID" => $CandID));
+
+        //delete from CNV
+        $result = $DB->delete("CNV", array("CandID" => $CandID));
+
+        //delete from genomic_candidate_files_rel
+        $result = $DB->delete("genomic_candidate_files_rel", array("CandID" => $CandID));
+
+        //delete from genomic_sample_candidate_rel
+        $result = $DB->delete("genomic_sample_candidate_rel", array("CandID" => $CandID));
+
+        //delete from issues
+        $result = $DB->delete("issues", array("candID" => $CandID));
+
         //delete from candidate
         $DB->delete("candidate", array("CandID" => $CandID));
     } elseif ($printToSQL) {
@@ -204,6 +266,21 @@ function deleteCandidate($CandID, $PSCID, $confirm, $printToSQL, $DB, $output)
         //delete from parameter_candidate
         _printResultsSQL("parameter_candidate", array("CandID" => $CandID), $output, $DB);
 
+        //delete from SNP_candidate_rel
+        _printResultsSQL("SNP_candidate_rel", array("CandID" => $CandID), $output, $DB);
+
+        //delete from CNV
+        _printResultsSQL("CNV", array("CandID" => $CandID), $output, $DB);
+
+        //delete from genomic_candidate_files_rel
+        _printResultsSQL("genomic_candidate_files_rel", array("CandID" => $CandID), $output, $DB);
+
+        //delete from genomic_sample_candidate_rel
+        _printResultsSQL("genomic_sample_candidate_rel", array("CandID" => $CandID), $output, $DB);
+
+        //delete from issues
+        _printResultsSQL("issues", array("candID" => $CandID), $output, $DB);
+
         //delete from candidate
         _printResultsSQL("candidate", array("CandID" => $CandID), $output, $DB);
 
diff --git a/tools/delete_timepoint.php b/tools/delete_timepoint.php
index 215fb7e1c56..67602e9c8ee 100644
--- a/tools/delete_timepoint.php
+++ b/tools/delete_timepoint.php
@@ -21,22 +21,6 @@
 require_once __DIR__ . "/../vendor/autoload.php";
 require_once __DIR__ . "/generic_includes.php";
 
-/**
- * This script deletes the specified candidate timepoint.
- *
- * Delete all timepoint rows for a given candidate
- * echo "Usage: php delete_timepoint.php delete_timepoint CandID PSCID SessionID [confirm] [tosql]";
- * echo "Example: php delete_timepoint.php delete_timepoint 965327 dcc0007 482";
- * echo "Example: php delete_timepoint.php delete_timepoint 965327 dcc0007 482 confirm";
- * echo "Example: php delete_timepoint.php delete_timepoint 965327 dcc0007 482 tosql";
- *
- * @category Main
- * @package  Loris
- * @author   Various <example@example.com>
- * @license  Loris license
- * @link     https://www.github.com/aces/Loris-Trunk/
- */
-
 // Possible script actions
 $actions = array('delete_timepoint');
 
@@ -107,8 +91,23 @@
             "in the database or is set to Active='N' state.\n\n";
         die();
     }
+    // Check for existence of imaging data
+    $filesExist = $DB->pselectOne(
+        "SELECT COUNT(*) FROM files WHERE SessionID=:sid",
+        array(
+            'sid' => $sessionID
+        )
+    );
+    $numFiles = (int)$filesExist;
+    if ($numFiles > 0) {
+        echo "Session ID $sessionID for candidate $CandID has imaging data and files ".
+            "in the database, and should not be deleted. Look at `files` and `tarchive` ".
+            "tables before deleting timepoint.\n\n";
+        die();
+    }
 }
 
+
 /*
  * The switch to execute actions
  */
@@ -135,7 +134,11 @@ function showHelp()
 
     die();
 }
-
+/*
+ * All tables with entries to be deleted here are only those with FOREIGN KEY relations to `session`.
+ * All other tables with FOREIGN KEY relations to these tables (second-level relations) should
+ * have actions on delete specified in the database schema
+ */
 function deleteTimepoint($CandID, $sessionID, $confirm, $printToSQL, $DB, $output)
 {
     echo "\n#########################################################################\n";
@@ -182,6 +185,24 @@ function deleteTimepoint($CandID, $sessionID, $confirm, $printToSQL, $DB, $outpu
     $result = $DB->pselect('SELECT * FROM media WHERE session_id=:sid', array('sid' => $sessionID));
     print_r($result);
 
+   // Print from issues
+    echo "\nIssues\n";
+    echo "-------\n";
+    $result = $DB->pselect('SELECT * FROM issues WHERE sessionID=:sid', array('sid' => $sessionID));
+    print_r($result);
+
+   // Print from mri_acquisition_dates
+    echo "\nMRI Acquisition Dates\n";
+    echo "-------\n";
+    $result = $DB->pselect('SELECT * FROM mri_acquisition_dates WHERE SessionID=:sid', array('sid' => $sessionID));
+    print_r($result);
+
+   // Print from mri_upload
+    echo "\nMRI Upload\n";
+    echo "-------\n";
+    $result = $DB->pselect('SELECT * FROM mri_upload WHERE SessionID=:sid', array('sid' => $sessionID));
+    print_r($result);
+
     // Print from session
     echo "\nSession\n";
     echo "---------\n";
@@ -230,6 +251,18 @@ function deleteTimepoint($CandID, $sessionID, $confirm, $printToSQL, $DB, $outpu
         echo "\n-- Deleting from media.\n";
         $DB->delete('media', array('session_id' => $sessionID));
 
+        //Delete from issues
+        echo "\n-- Deleting from issues.\n";
+        $DB->delete('issues', array('sessionID' => $sessionID));
+
+        // Delete from mri_acquisition_dates
+        echo "\n-- Deleting from mri acquisition dates.\n";
+        $DB->delete('mri_acquisition_dates', array('SessionID' => $sessionID));
+
+        // Delete from mri_upload
+        echo "\n-- Deleting from mri upload.\n";
+        $DB->delete('mri_upload', array('SessionID' => $sessionID));
+
         // Delete from feedback
         echo "\n-- Deleting from feedback.\n";
         foreach ($feedbackIDs as $id) {
@@ -261,6 +294,18 @@ function deleteTimepoint($CandID, $sessionID, $confirm, $printToSQL, $DB, $outpu
         $output .= "\n-- Deleting from media.\n";
         _printResultsSQL('media', array('session_id' => $sessionID), $output, $DB);
 
+        // Delete from issues
+        $output .= "\n-- Deleting from issues.\n";
+        _printResultsSQL('issues', array('sessionID' => $sessionID), $output, $DB);
+
+        // Delete from mri_acquisition_dates
+        $output .= "\n-- Deleting from MRI acquisition dates.\n";
+        _printResultsSQL('mri_acquisition_dates', array('SessionID' => $sessionID), $output, $DB);
+
+        // Delete from mri_upload
+        $output .= "\n-- Deleting from MRI upload.\n";
+        _printResultsSQL('mri_upload', array('SessionID' => $sessionID), $output, $DB);
+
         // Delete from feedback
         $output .= "\n-- Deleting from feedback.\n";
         foreach ($feedbackIDs as $id) {
diff --git a/tools/install.sh b/tools/install.sh
index 9b4947095ba..e4c28613d77 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -156,6 +156,7 @@ fi
 
 if [ $os_distro = "Ubuntu" ]; then
     sudo chown www-data.www-data ../modules/document_repository/user_uploads
+    sudo chown www-data.www-data ../modules/data_release/user_uploads
     sudo chown www-data.www-data ../smarty/templates_c
     # Make Apache the group for project directory, so that the web based install
     # can write the config.xml file.
@@ -163,13 +164,14 @@ if [ $os_distro = "Ubuntu" ]; then
     sudo chmod 770 ../project
 elif [ $os_distro = "CentOS" ]; then
     sudo chown apache.apache ../modules/document_repository/user_uploads
+    sudo chown apache.apache ../modules/data_release/user_uploads
     sudo chown apache.apache ../smarty/templates_c
     # Make Apache the group for project directory, so that the web based install
     # can write the config.xml file.
     sudo chgrp apache ../project
     sudo chmod 770 ../project
 else
-    echo "$os_distro Linux distribution detected. We currently do not support this. Please manually chown/chgrp the user_uploads directory in ../modules/document_repository to the web server and ../smarty/templates_c"
+    echo "$os_distro Linux distribution detected. We currently do not support this. Please manually chown/chgrp to the web server user in: the user_uploads directory in ../modules/data_release/ and ../modules/document_repository/, as well as ../smarty/templates_c/"
 fi
 
 
@@ -182,7 +184,7 @@ if [ -d logs ]; then
     elif [ $os_distro = "CentOS" ]; then
         sudo chgrp apache logs
     else
-        echo "$os_distro Linux distribution detected. We currently do not support this. Please manually set the permissions for user_uploads directory in ../modules/document_repository"
+        echo "$os_distro Linux distribution detected. We currently do not support this. Please manually set the permissions for the directory tools/logs/"
     fi
 fi
 
diff --git a/webpack.config.js b/webpack.config.js
index 1909a4e47b7..55f0143fc60 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -49,7 +49,8 @@ var config = [{
     './modules/help_editor/js/columnFormatter.js': './modules/help_editor/jsx/columnFormatter.js',
     './modules/brainbrowser/js/Brainbrowser.js': './modules/brainbrowser/jsx/Brainbrowser.js',
     './modules/data_integrity_flag/js/index.js': './modules/data_integrity_flag/jsx/index.js',
-    './modules/imaging_uploader/js/index.js': './modules/imaging_uploader/jsx/index.js'
+    './modules/imaging_uploader/js/index.js': './modules/imaging_uploader/jsx/index.js',
+    './modules/acknowledgements/js/columnFormatter.js': './modules/acknowledgements/jsx/columnFormatter.js'
   },
   output: {
     path: './',