Finish Feature 1
Merge branch 'feature1' into develop
Merge pull request #1 from nganhtuan63/develop

Develop