NOJIRA get() support for annotation geometry
PROV-955 fix xpath support for namespaced attributes
Merge branch 'develop' of github.com:collectiveaccess/providence into develop
reset support for additional controls
Merge pull request #123 from libis/reset_advance_search

reset support for additional controls
NOJIRA Implemented more reliable way to extract IPTC metadata from images for both GraphicksMagick and ImageMagick (CLI versions)
NOJIRA backport caProcessTemplateForIDs() fixes
Merge branch 'develop' of github.com:collectiveaccess/providence into develop
Merge branch 'master' into master-fix
NOJIRA Now prevent usage of wysiwyg editor in search forms
Merge branch 'master-fix' into develop

Conflicts:
	app/helpers/displayHelpers.php
	themes/default/views/find/Search/search_advanced_form_html.php
NOJIRA Revert displayHelpers.php to pre-merge version. I assume the fixes in master-fix were specific for that branch and all of this has already been sorted out here in develop.
NOJIRA There is a bug in PHP 5.3.x that prevents us from using this definition.

The resulting error is: Can't inherit abstract function IAttributeValue::getType() (previously declared abstract in AttributeValue). There is an abstract function getType() here and the same thing is defined in the Interface. The AttributeValue implementations inherit from this class and implement the Interface, which makes PHP versions prior to 5.3.9 barf (even though it shouldn't). It's fixed in 5.3.9+. The widely used RHEL/CentOS 6.5 (latest version as of July 2014) still uses PHP 5.3.3 though, so we uncomment this for now. The interface still requires AttributeValue implementations to implement this method so we should be okay.
NOJIRA Added support for browse on intrinsic deaccession date
Merge branch 'develop' of github.com:collectiveaccess/providence into develop
NOJIRA check to see if there is an idno plugin before attempting to set database context
NOJIRA force non-lookup list elements in search forms to <select>'s with "no value" option, otherwise there's no way to do a search without some value from the checkbox
PROV-964 clean up templates; add option for label border outlines
Merge branch 'develop' of github.com:collectiveaccess/providence into develop
PROV-964 Added barcode support. Added {{{}}} substitution to summaries