Merge "Beautification of soure-code" into tizen_2.2