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
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
NOJIRA fix parse issue in qualified searches that prevented created: and modified: from working
NOJIRA Relationship settings need to be in an array

Conflicts:
	app/helpers/importHelpers.php
Merge pull request #135 from kehh/fixRelationshipRelationshipForUpstream

NOJIRA Importer Fix Relationship settings need to be in an array
PROV-997 Added skipIfExpression setting to exporter

It uses the ExpressionParser that was written for the importer (see
http://docs.collectiveaccess.org/wiki/Expressions). You can reference
the value of the current mapping as variable ^value. Next we’re going
to implement a system that allows you to define your own variables in
exporter mappings which can then be referenced in these expressions. At
the moment they’re pretty useless.
PROV-998 Added variables to exporter

This allows you to use all the available exporter features to assign
dynamic values to an identifier and then later reference it as variable
in expressions for skipIfExpression. This is the only use so far but
potentially we could also allow using those as source or in templates
as well. The notion of saving something and then using it in a
different context later can be very useful in data exports.
NOJIRA enable CSS scaling of images for presentation of high-resolution imagery in PDFS
NOJIRA added documentation
NOJIRA add current() and future() date functions to expression parser
PROV-994 Display list items as display text, not ids in dependent text elements
Merge branch 'develop' of github.com:collectiveaccess/providence into develop