Merge branch '2.0_beta' of ssh://112.106.1.251:29418/framework/uifw/edje into 2.0_beta