added getObjectID() function
Added type_id param
Merge branch 'master' of github.com:collectiveaccess/providence

Conflicts:
	app/lib/ca/Utils/DataMigrationUtils.php
Added support for sorting of relationships
Added support for configurable templated output of relationships
Merge branch 'batch_editing' of github.com:collectiveaccess/providence into batch_editing
Merge branch 'master' of github.com:collectiveaccess/providence
Merge branch 'batch_editing'