Merge remote-tracking branch 'remotes/origin/master' into ics

Conflicts:
	dependency/google-play-services_lib/project.properties
	local.properties
	taskwidget/AndroidManifest.xml
	taskwidget/build.gradle
	taskwidget/res/drawable-hdpi/appwidget_dark_bg.9.png
	taskwidget/res/drawable-hdpi/bg_dark.9.png
	taskwidget/res/layout/refresh_view.xml
	taskwidget/res/layout/widget_black.xml
	taskwidget/res/layout/widget_transparent.xml
	taskwidget/res/values/dimens.xml
	taskwidget/res/xml/cfgpref.xml
	taskwidget/src/com/dima/tkswidget/WidgetController.java
	taskwidget/src/com/dima/tkswidget/activity/WidgetCfg.java
	taskwidget/src/com/dima/tkswidget/activity/WidgetCfgFragment.java