Merge "Code Refactoring for Wifi-Direct" into tizen_2.1