Merge "Beautification of appfw/inc soure-code" into tizen_2.2