Merge remote-tracking branch 'origin/tizen_work' into tizen

Merge remote-tracking branch 'origin/tizen_work' into tizen

Conflicts:
	.cproject
	CMakeLists.txt
	inc/noti.h
	inc/quickpanel-ui.h
	inc/setting_module_api.h
	inc/setting_utils.h
	inc/settings.h
	packaging/org.tizen.quickpanel.spec
	project_def.prop
	src/notifications/noti.c
	src/quickpanel-ui.c
	src/settings/modules/bluetooth.c
	src/settings/modules/gps.c
	src/settings/modules/wifi.c
	src/settings/setting_module_api.c
	src/settings/setting_utils.c
	tizen-manifest.xml

Change-Id: I80f7c145a453295419af76a1af8dc53ec94252ef