Merge branch '2.0_beta' of ssh://tizendev.org:29418/apps/home/settings into 2.0_beta