NOJIRA fix output issues (misplaced values) when pulling a repeating container from a related record
Merge branch 'develop' of github.com:collectiveaccess/providence into develop

Conflicts:
	app/helpers/displayHelpers.php
PROV-976 Improve markup preservation
NOJIRA remove old code
Merge branch 'develop' of github.com:collectiveaccess/providence into develop
Various fixes for undefined variables

$vb_batch_mode => $vs_batch_mode
$pn_locale_id no longer defined
$ps_source_info => $pa_source_info
Fix some white space
Fix missing variable row id $vn_row_id => $vn_row
Fix missing variable $ps_loan_name
Set correct parameters for caProcessRefineryRelated

Conflicts:
	app/helpers/importHelpers.php
Removing incorrect phpdoc and whitespace
Remove conflict files committed in error

I noticed these coming in on a recent pull and am assuming they were
committed in error.
Merge pull request #132 from kehh/importFixesForUpstream

Import fixes for upstream
NOJIRA Make authority elements return numeric id during duplication
NOJIRA Fix transaction hang during duplication of objects with representations
NOJIRA fix barf when trying to reconnect after mysql crash
Fix delimiter variable name
NOJIRA Fix typos / required params in ca_data_importers

* ncurses_refresh() requires a character to refresh. Took a guess and it seems to work
* vb_use_ncurses was always false.
* ncurses_init() has a void return.
* $vn_c not defined when trying to parse idno. As idno cannot be multi valued I pass an explicit null (which is what it would do anyway)
* $vn_index is not tefiend for $va_item['settings']['delimiter'] on line 1899
* Also pass the importEvent and importEventSource to hookDataImportContentTree

Conflicts:
	app/models/ca_data_importers.php
NOJIRA oops putting back the missing 'mapping' element.
Merge pull request #134 from kehh/importFixesForUpstream

NOJIRA - Importer fixes and pass import event to import plugin
Merge branch 'develop' of github.com:collectiveaccess/providence into develop