Merge code
Merge branch 'master' of https://github.com/TripolisSolutions/TripolisVietnam_SCRAT_WeatherApp