Added nonpreferred labels to service
Basic groundwork for new import framework
Added support for user authentication against external SQL databases
Documentation will be at http://docs.collectiveaccess.org/wiki/Authentication.conf
Merge branch 'master' into extdb_auth
added getObjectID() function
Added type_id param
Merge branch 'master' of github.com:collectiveaccess/providence

Conflicts:
	app/lib/ca/Utils/DataMigrationUtils.php
Translation : removing single quote (apostrophe) from javascript messages

Translation : removing single quote (apostrophe) from javascript messages
Vocabulary : french translation of "storage location" becomes "emplacement"

Vocabulary : french translation of "storage location" becomes "emplacement"
Merge branch 'master' of https://github.com/collectiveaccess/providence
Removing _t around empty string '' as it throws an error with POEdit when updating translation strings

Removing _t around empty string '' as it throws an error with POEdit when updating translation strings
i18n button name

i18n button name
i18n button name

i18n button name
Translation : strings updated to add new texts

Translation : strings updated to add new texts
l10n : update

l10n : update
l10n : update

l10n : update
Merge branch 'master' of https://github.com/ideesculture/providence

Conflicts:
	app/locale/fr_FR/messages.mo
	app/locale/fr_FR/messages.po
l10n : corrections

l10n : corrections
l10n : translation in progress

l10n : translation in progress
l10n : translation in progress

l10n : translation in progress