made mention of branches being worked upon
Update readme.txt
Update readme.txt
Merge branch '20131025-federated-cloud-contacts'

# By Robin Raymond (29) and others
# Via Robin Raymond (7) and Sergej Jovanovic (2)
* 20131025-federated-cloud-contacts: (52 commits)
  - updated boost readme for comiler flags
  - fix Turn socket crashes upon turn server closing https://github.com/openpeer/op/issues/19
  - validation of app ID see: https://github.com/openpeer/op/issues/6
  - fixed garbelled debug message - use safer memmove than memcpy for buffered transmit of data for logger
  - ortc-lib updated
  - fixed iOS audio driver problem
  Replaced deprecated types.
  - added MLS level insane logging
  - default log level for javascript when logging gets turned to max should be trace
  - was not demuxing TURN packets from the server properly (should not be okay)
  Added JavaScript log module.
  - fixed incorrect debug message
  - added log level for javascript
  - added compleeted state to ICE - fixed crash upon ice restart
  - fixed subprojects for ortc-lib workspace
  Updated comments, and fixed some minor bugs.
  Updated
  Removed unused files and deleted commented code.
  - added srtp / openssl dependency
  Updated login procedure to use web page.
  ...
- updated readme to not indicate to clone wrong branch (since master can be cloned)
Merge branch '20131025-federated-cloud-contacts'

* 20131025-federated-cloud-contacts:
  - updated change log
  - Fix: ice socket exception did not clean up bind mapping properly so socket thought it was bound when it was not bound - Fix: exception in logger can cause crash when device lock used
  https://github.com/openpeer/opios/issues/61
  - fixed some warning messages (language and subscription which was not needed)
  - make sure to recheck pairings that might not have been fully checked when nominiated pair fails
  - adding starting change log
  - removed bogus complation script that doesn't work
- merging federated cloud contacts
- Fix: RUDP messaging doesn't think it is established because of a missing lock
https://github.com/openpeer/op-stack-cpp/issues/53
- fix: Alice goes to background, Bob doesn't fully realize Alice is gone
https://github.com/openpeer/op-stack-cpp/issues/52

- Fix: RUDP doesn't recognize remote close properly so disconnection takes too much time
https://github.com/openpeer/op-stack-cpp/issues/54
- Fix: Core conversation thread doesn't seem to detect when push is to be sent or not properly
https://github.com/openpeer/op-core-cpp/issues/4
Merge branch '20131025-federated-cloud-contacts' into feature-20140307-op-push-and-reconnection-fix

# By Sergej Jovanovic
# Via Sergej Jovanovic
* 20131025-federated-cloud-contacts:
  Added missing header for APNS target.
  Added cancel button on qr scanner screen, to cancel scanning.
  Settings cleanup. Cache database is now saved in Cache folder. It is enabled that developers can implement their cache storage.
  2nd stage settings. Updated loading settings flow. Removing QR applied settings on logout. Fixed known settings bugs.
  Added method for preloding settings
Fixed wrong settings key bug and value for openpeer/stack/finder-max-client-session-keep-alive-in-seconds is set to 300
- reverted back to proper submodule push fix
- Fix: messages were considered illegal during pre-identify stage which were legal
https://github.com/openpeer/opios/issues/234
Improved logger. Log messages are created only for selected log levels.
Merge remote-tracking branch 'origin/20131025-federated-cloud-contacts'

# By Sergej Jovanovic (104) and others
# Via Robin Raymond (16) and others
* origin/20131025-federated-cloud-contacts: (203 commits)
  Improved logger. Log messages are created only for selected log levels.
  - Fix: messages were considered illegal during pre-identify stage which were legal https://github.com/openpeer/opios/issues/234
  - reverted back to proper submodule push fix
  Fixed wrong settings key bug and value for openpeer/stack/finder-max-client-session-keep-alive-in-seconds is set to 300
  - Fix: Core conversation thread doesn't seem to detect when push is to be sent or not properly https://github.com/openpeer/op-core-cpp/issues/4
  - fix: Alice goes to background, Bob doesn't fully realize Alice is gone https://github.com/openpeer/op-stack-cpp/issues/52
  Added missing header for APNS target.
  - Fix: RUDP messaging doesn't think it is established because of a missing lock https://github.com/openpeer/op-stack-cpp/issues/53
  Added cancel button on qr scanner screen, to cancel scanning.
  - delegate missing queue crash fix
  - fix: ICE Priority values need to change when IPs are re-arranged in priority order https://github.com/openpeer/op-services-cpp/issues/26
  Updated APNS target
  Settings cleanup. Cache database is now saved in Cache folder. It is enabled that developers can implement their cache storage.
  - Fix: Account Peer Location was preventing the sending of "peer-location-notifies" until "identify" completed https://github.com/openpeer/op-stack-cpp/issues/51
  2nd stage settings. Updated loading settings flow. Removing QR applied settings on logout. Fixed known settings bugs.
  - moved hard coded setting to optional setting for minimal keep alive duration https://github.com/openpeer/op-services-cpp/issues/20
  - fix: correctly detects multi-homed TURN creation situation https://github.com/openpeer/op-services-cpp/issues/20
  - Account peer location find request should not wait until ICE is fully ready https://github.com/openpeer/op-stack-cpp/issues/47
  - Account peer location requester side needs to send "peer-location-find" update notifies https://github.com/openpeer/op-stack-cpp/issues/48
  - Need a reasonable end of candidates timeout for account peer location (since request never truly times out anymore) https://github.com/openpeer/op/issues/54
  ...

Conflicts:
	libs/op
- readme updated to point to the new development stable branch name
- added latest merged changes to change log
- fixed unusual race condition found after merge
- fix: potential crash if setting specified wrongly
Merge commit '58f71bd36c7eb3fc0bfccf22607f22873d64045c' into feature-20140307-url-settings