Updated documentation for using identity with local Identity API.
Fixed merge issues.