orientation with conflict
Merge branch 'master' of https://github.com/Gorbos/DualCam.git
commit orientation
orientation commited