Added file5 and modified file2 after merging from master

We've made some change after merging from origin master