Merge upsteam20140813

Updating to the latest upstream changes. Was hoping to get relationship types for identifications to be useable again.
Merge remote-tracking branch 'remotes/collectiveaccess/develop' into mergeUpsteam20140813
    
    * remotes/collectiveaccess/develop: (68 commits)
      NOJIRA Fix issue that could prevent proper loading of items by idno in ItemService
      PROV-1014 Resolve issue that cause "list" drop-down in metadata element config screen to reflect value before sav
      NOJIRA resize logo
      NOJIRA remove use of CSS float since it has proven unreliable (and slow)
      NOJIRA use server paths rather than urls for better compatibility with locked-down servers
      NOJIRA sync with Pawtucket
      NOJIRA don't let hierarchy path cache get too large
      NOJIRA preserve label field name when qualifying search. Before ca_entities.preferred_labels.surname (for instanc
      NOJIRA fix issue preventing relationship type qualifiers on wildcard searches
      NOJIRA remove extraneous text
      NOJIRA fix relationship label generator for many-one relationships
      PROV-1012 suppress "part of lot" message if linked lot has been deleted
      NOJIRA date joiner now removes no numeric trailing text
      NOJIRA don't add prefix/suffix if value is empty
      PROV-977 Implement extension-less matching for media
      NOJIRA fix issue where first item in simple hierarchy is overwritten when displayed
      NOJIRA filter deleted items from use history
      NOJIRA fix issue with simple hierarchies getting hierarchy names overwriting first element
      NOJIRA Add correct current schema migration version to schema_mysql.sql
      NOJIRA don't return template in relationship lookup label generator as link because it throws autocomplete format
      ...
    
    Conflicts:
        app/helpers/displayHelpers.php
        app/lib/ca/BundlableLabelableBaseModelWithAttributes.php
        app/lib/ca/Utils/DataMigrationUtils.php
        app/models/ca_data_importers.php