Merge "Modify Scanner class" into tizen_2.1