Rename LookupRef.id to uri, and add an id field
Merge branch 'add-ids-to-lookup-refs' into stage

Conflicts:
	src/main/java/org/atlasapi/persistence/content/EquivalenceWritingContentWriter.java