NOJIRA Fixed for various importer issues: "skip" broken + lot id lookups not working for pure numeric
Merge branch 'master' of github.com:collectiveaccess/providence
An update of the Graham Foundation profile
NOJIRA Hash css / javascript files and append the hash to their URL
This prevents users from having to flush their browser cache if
their contents change
Get the user to confirm before adding a new point to the map
NOJIRA Fixing typo - px not spx
Revert "Get the user to confirm before adding a new point to the map"

This reverts commit 22198a6cb08f06d5368f71f84ae270012f4874c3.
Revert "NOJIRA Hash css / javascript files and append the hash to their URL"

This reverts commit b23861789f2ffe00c5c06c295b1701500a9d431d.
Revert "NOJIRA Fixing typo - px not spx"

This reverts commit b04f03618665756dc060246936983bdcebfda11b.
Merge branch 'master' of github.com:collectiveaccess/providence
PROV-618 fix improper trimming of spaces by DomDocument that results in <ifdef> and <ifnotdef> failing when the contained string contains leading spaces and embedded HTML tags.
Merge branch 'master' of https://github.com/kehh/providence
PROV-619 Quickadd editors now force rich text fields to save properly. This issue was due to CKEditor not updating the underlying form field until submit; these popup editors use jquery to submit via ajax
PROV-620 Fix for repeating containers being merged in bundle display templates
Merge branch 'master' of github.com:collectiveaccess/providence

Conflicts:
	app/helpers/displayHelpers.php
NOJIRA : French translation to dublincore profile added

nojira start tag to mimic CA repo conventions, if it's not needed in the future don't hesitate to say so.

Signed-off-by: gautiermichelin <gm@ideesculture.com>
Merge pull request #53 from ideesculture/dublincore

NOJIRA : French translation to dublincore profile added
Merge branch 'master' of github.com:collectiveaccess/providence
PROV-618, PROV-620 Fix mangled merge + minor view issue
PROV-626 Fix delete button suppression issue