Merge pull request #1862 from ssushma/dev-branch

Font issue changes updated.
Unit title will appear on the top
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch