1. modify files
2. fix bug roll back go to view
Merge remote-tracking branch 'origin/master'