Merge branch 'develop'
add file2 on hotfix-0.0.1 branch
Merge branch 'hotfix-0.0.1' into develop