add main view
add main view
Merge remote-tracking branch 'origin/master'
1