Moving the assignment of identity data
Merge pull request #656 from khawkins/move_identity_assignment

Moving the assignment of identity data
Merge remote-tracking branch 'origin/master' into unstable_merge
Merge pull request #657 from khawkins/unstable_merge

Mobile SDK: Merging master to unstable