Merge "fixed the description" into tizen_2.1