merge remote
add ctr view
Merge branch 'dev'