iOS Support
Merge branch 'develop' into ios

* develop:
  update optional user data
  fix typo
Fix issues with datatypes in setUserInfo
Merged in ios (pull request #2)

iOS Support