- fixed encoding video parameters for portrait orientation on Android
https://github.com/openpeer/opandroid/issues/609
Merge branch 'feature-20140820-camera-config' into 20140401-dev-stable

Conflicts:
	libs/op-core-cpp
Merge branch '20140401-dev-stable' into feature-20141015-curl-fixing