Merge branch 'master' of github.com:collectiveaccess/providence into develop
Prevent type error in foreach() loop.

It is possible that getRepresentations() returns null, so we need to ensure that the return value is
actually an array before attempting to loop over it.
PROV-913 Relationship generator plugin

+ Plugin which automatically adds and removes relationships based on configured rules.
+ Base configuration for plugin, which does not contain any rules, but has some sensible defaults for other config items.
+ Unit tests for plugin configuration check, with various configuration files that are invalid in different ways.
+ Unit tests / integration tests for plugin functionality, which processes a template into a unique configuration file, and
  exercises the plugin through real database interactions.
+ Low level .gitignore ensures that the generated configuration file is never added to VCS.
+ Add unit tests to phpunit.xml.
+ Reformat whitespace in phpunit.xml.
Fix GeocodeAttributeValueTest failures.

+ Pass $delta to numeric comparison in address lookup where accuracy is not perfect.
+ Use regexp match for string comparison in address lookup where accuracy is not perfect.
+ Swap $expected and $actual around to the right order (expected first, then actual).
+ Add test messages.
Merge pull request #100 from leftclickben/PROV911

PROV-911 Prevent type error in foreach() loop.
Merge pull request #102 from leftclickben/PROV-914

PROV-914 Fix GeocodeAttributeValueTest
Merge pull request #101 from leftclickben/PROV-913

PROV-913 Relationship generator plugin
interstitual information display
Merge pull request #103 from libis/interstitual

interstitual information display
Merge branch 'master' into master-fix

Conflicts:
	app/helpers/displayHelpers.php
Merge branch 'master-fix' into develop
NOJIRA fix tools screens
Merge branch 'develop' of github.com:collectiveaccess/providence into develop
Don't use local config in unit tests.

+ Define a constant in phpunit.xml.
+ Only set __CA_LOCAL_CONFIG_DIRECTORY__ when not in a unit test.
Merge pull request #104 from leftclickben/PROV-916

PROV-916: Don't use local configuration in unit tests
PROV-917 Metadata importer can now import file batches
PROV-918 Implementation of dependent text fields in containers, with unit conversion. Does not, yet, support padding and truncation.
NOJIA catch exception
NOJIRA don't enforce type restrictions when no type is set (common for list items)
NOJIRA suppress warning when text extraction of word docs fails