Merge "Beautified source code of appfw/inc" into tizen_2.2