Merge "Added new CAPI to get the wps pin number from supplicant" into tizen

diff --cc include/network_dbus.h
Simple merge

diff --cc include/network_interface.h
Simple merge

diff --cc include/wifi_internal.h
Simple merge

diff --cc src/network_dbus.c
Simple merge

diff --cc src/network_interface.c
Simple merge

diff --cc src/wifi_internal.c
Simple merge

diff --cc src/wifi_manager.c
Simple merge

diff --cc test/wifi_manager_test.c
Simple merge