Init develop
Modify controller
Merge pull request #2 from nguyentrongtam/develop

Modify controller
Revert "Modify controller"
Merge pull request #3 from kakalove/revert-2-develop

Revert 2 develop