tizen2.1 code merge