Merge branch 'master' into tizen_2.1
Conflicts:
CMakeLists.txt
include/mobileap.h
include/mobileap_agent.h
include/mobileap_bluetooth.h
include/mobileap_common.h
include/mobileap_network.h
include/mobileap_notification.h
include/mobileap_usb.h
include/tethering-dbus-interface.xml
packaging/mobileap-agent.spec
src/mobileap_bluetooth.c
src/mobileap_common.c
src/mobileap_main.c
src/mobileap_network.c
src/mobileap_notification.c
src/mobileap_usb.c
src/mobileap_wifi.c
Change-Id: Ie6463f7fc67d0173d1584926d197631bbd8e4923