commit ignore file.
Merge branch 'master' into develop
Fixed Unit Test issue.
A little code refactor
refactor