viewport setting1
Merge branch 'master' into development