Merge pull request #55 from tunghdt91/develop

side bar
Merge pull request #56 from tunghdt91/develop

Merge pull request #55 from tunghdt91/develop