PROV-551 Added "parents" option to listItem and storageLocation refineries`
Merge branch 'master' of http://github.com/collectiveaccess/providence
Merge branch 'master' of http://github.com/collectiveaccess/providence
NOJIRA jsonlint git problem
Merge branch 'master' of http://github.com/collectiveaccess/providence

Conflicts:
	app/refineries/listItemSplitter/listItemSplitterRefinery.php
	app/refineries/storageLocationSplitter/storageLocationSplitterRefinery.php
	jsonlint
Merge branch 'master' of http://github.com/collectiveaccess/providence
PROV-537 Do merge-on-label using values run through format templates to prevent mismatches
Merge branch 'master' of http://github.com/collectiveaccess/providence