Merge branch 'feature-20140730-is-composing' into 20140401-dev-stable

Conflicts:
	libs/op-core-cpp
- fixed problem with retrieving front camera capabilities
https://github.com/openpeer/opandroid/issues/607
Merge branch 'feature-20140820-camera-config' into 20140401-dev-stable

Conflicts:
	libs/op-core-cpp
add debug options to build script
Merge remote-tracking branch 'origin/20140401-dev-stable' into feature-20140521-push-messaging

Conflicts:
	libs/op-core-cpp
	libs/ortc-lib