Updated submodule
Merge remote-tracking branch 'origin/feature-20140730-is-composing' into 20140401-dev-stable
Updated submodule
-pointed submodules properly
Merge commit '859d56f1cd5d34fd12ad863d18dc452f6c91162e' into feature-20140730-is-composing

Conflicts:
	libs/op