Fix for text issues
Merge branch 'develop' of github.com:suhasg/changepond-skejul into develop