Fix bug on mainlayout ethiopian calender and modified UI of Gift certificate
Merge branch 'master' of https://github.com/EdgeComputing/cats