Merged mpetkova/master
Modified NDB_BVL_Instrument.class.inc that fixes the requirement's errors
Merge remote-tracking branch 'aces/master' into TestMiaMerge
Fixed a bracket missing in Candidate.class.inc

	modified:   ../php/libraries/Candidate.class.inc
	modified:   data_dictionary_builder.php
print stuff in minc.php for debugging
Merge remote-tracking branch 'aces/master' into TestMerge

Conflicts:
	htdocs/main.css
	htdocs/minc.php
	php/libraries/Candidate.class.inc
	php/libraries/MRIMenuPage.class.inc
	php/libraries/MRIViewScansPage.class.inc
	php/libraries/NDB_BVL_Instrument.class.inc
	php/libraries/NDB_Form_conflicts_resolve.class.inc
	php/libraries/NDB_Menu_Filter_tracking_logs.class.inc
	php/libraries/Utility.class.inc
	smarty/templates/login.tpl
	smarty/templates/main.tpl
	smarty/templates/menu_timepoint_list.tpl
	smarty/templates/menu_user_accounts.tpl
	smarty/templates/mri_browser_main.tpl
	smarty/templates/mri_browser_visit_list.tpl
	smarty/templates/mri_browser_volume_list.tpl
	smarty/templates/mri_efax.tpl
	modified:   php/libraries/Utility.class.inc
Added one intensity predifined comment for DTI QC:
"susceptibility artifact due to anatomy"
Added option to use different database or table for history
Ran PHPCS on Database post-rebasing branch
Ran PHP_Codesniffer on TimePoint class
Updating config descriptions.
Update logo description.
Removing columnThreshold from config module, return to config.xml.
Ran conflict detector class through PHPCS
Modified the help for the data_team_helper
Update the data_team_helper help module for the existing project
Display the percentage only if the test_name is selected
add a readme for the mac install
update with christine's comments