Merge branch 'master' of git.mobileinno.com:psyncgui into SLX-294
Merge branch 'master' of git.mobileinno.com:psyncgui into SLX-239