Merge branch 'master' of ssh://tizendev.org:29418/apps/home/settings