- settings were not being stored correctly in memory when no settings delegate present
Merge branch '20140401-dev-stable' into feature-20140804-settings-fix
- fix in log message
- fixed potential violations of document locking from cacheable document
Merge remote-tracking branch 'origin/feature-20140804-fix-android-scripts' into feature-20140804-settings-fix
Merge remote-tracking branch 'origin/20140401-dev-stable' into feature-20140730-is-composing

Conflicts:
	libs/op