SLX-236 | fix long company name
Merge branch 'master' of git.mobileinno.com:psyncgui into SLX-294
Merge branch 'master' of git.mobileinno.com:psyncgui into SLX-239
SLX-239 | gen
SLX-239 | gen - add Cancel Btn also
Merge branch 'master' of git.mobileinno.com:psyncgui into SLX-239