update
Merge branch 'develop' of github.com:framgia/framgia_os
Merge pull request #4 from framgia/master

Master