wellcome text fixes
fix itservice controller error
Merge branch 'design'
fix merge conflict