Changes in mainview Orientation
Merge branch 'origin/master'