- cleanup of IHelper references
- settings were not being stored correctly in memory when no settings delegate present
- fix: can freeze making didd document
https://github.com/openpeer/opios-production/issues/167
- fix in log message
fix android build script
- fixed potential violations of document locking from cacheable document
Merge remote-tracking branch 'origin/feature-20140804-fix-android-scripts' into feature-20140804-settings-fix
- fixed potential errors in diff processing when attribute id has "/" in value
Merge remote-tracking branch 'origin/20140401-dev-stable' into feature-20140730-is-composing
- fix: diff creator log cleanup
https://github.com/openpeer/opios-production/issues/167
Merge remote-tracking branch 'origin/feature-20140730-is-composing' into feature-20140521-push-messaging

Conflicts:
	openpeer/stack/cpp/stack.cpp
Merge remote-tracking branch 'origin/feature-20140730-is-composing' into feature-20140521-push-messaging