FTS-00009 - Fix bug and implement new requirement for request at 14 Nov
FTS-00010, remove files from tracking
Merge pull request #1 from nguyentuonglam/develop

Develop