Merge "merge changed things from tizen_2.1" into tizen_2.2