Merge branch 'tizen_2.1' of ssh://tizendev.org:29418/apps/home/settings into tizen_2.1