Merge branch 'master' into tizen_2.1

Merge branch 'master' into tizen_2.1

Conflicts:
	inc/FShellAppWidgetProviderManager.h
	inc/FShellLockManager.h
	inc/FShellNotificationManager.h
	inc/FShellQuickPanelFrame.h
	inc/FShellShortcutManager.h
	src/FShell_AppWidgetPopupView.cpp
	src/FShell_AppWidgetPopupView.h
	src/FShell_AppWidgetProviderManagerImpl.cpp
	src/FShell_AppWidgetView.cpp
	src/FShell_AppWidgetView.h
	src/core/FShellShortcutManager.cpp

Change-Id: Ieadba936ebda9534a412b69e6cfa1f5227afd3fb
Signed-off-by: jungmin76.park <jungmin76.park@samsung.com>