SQL changes and upgrade scripts for instruments
Merge remote branch 'origin/schema-change-2014-05' into instruments2

Conflicts:
	admin/sql/CreateFKConstraints.sql
	admin/sql/CreateFunctions.sql
	admin/sql/CreateSearchIndexes.sql
	upgrade.sh
Update function and trigger names
Alphabetical order for relationship type tables
Add ordering columns stuff for instruments
Use singular terms for instrument types
Use generate_uuid_v3 when inserting new relationship types
Add missing upgrade scripts to upgrade.sh
Remove accidentally committed commented out stuff
Remove more accidentally committed commented out stuff
Merge remote branch 'origin/schema-change-2014-05' into instruments2

Conflicts:
	admin/sql/DropFKConstraints.sql
	admin/sql/DropPrimaryKeys.sql
	admin/sql/DropSearchIndexes.sql
Add constraints to the upgrade script for instruments
Insert new rows as a single statement
Merge 20140308-instrument-fk.sql and 20140308-instrument-pk.sql into 20140217-instrument-triggers.sql and 20140214-add-instruments.sql
Add all triggers to the instrument upgrade script
Add missing function to instrument upgrade script
Set sequences before and after inserting data for instruments
Various fixes to the instruments upgrade script - Add missing description column, avoid nulls in descriptions, escape ., match multiple spaces, fix typo
Merge remote branch 'origin/schema-change-2014-05' into instruments2

Conflicts:
	admin/sql/CreateFunctions.sql
	admin/sql/DropFunctions.sql
Address various issues from the pull request