change view
Merge branch 'getview' into dev
merge code