Load settings fix.
Merge remote-tracking branch 'origin/20140401-dev-stable' into feature-20140730-is-composing
Merge remote-tracking branch 'origin/20140401-dev-stable' into feature-20140730-is-composing

Conflicts:
	libs/op-core-cpp