Template is updated
Merge branch 'master' of https://github.com/gihantharanga/CMS.git