forget commit 2 view files
Merge branch 'develop'