primary keys and upsert for int and string
Merge branch 'master' into al-primary
don't allow primary properties to be changed, tests
fixes for upsert
Extract duplicated code in setter creation
Merge pull request #871 from realm/tg-setter-extract

Extract duplicated code in setter creation
Merge branch 'master' into al-primary
fix for hash and isEqual
Merge branch 'al-primary' of https://github.com/realm/realm-objc into al-primary
add createOrUpdate methods on RLMObject
fix for swift test
pr fixes
fix for other swift test
more swift test fixes
factor out code for creating or updating rows on insert
store primary key in metadata
fix for updating nested objects, fix for creating object with primary key values of 0 and ""
add test condition for updating objects in RLMArray properties
comment cleanup
Merge commit '4b7d8c9c5fa21e1ee2fd52ad1b8815d50e5d9896' into away4m

Conflicts:
	Realm/RLMAccessor.mm