Merge branch 'develop' of https://github.com/framgia/fels_8 into develop