merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	taskwidget/src/com/dima/tkswidget/TaskWidgetProvider.java
	taskwidget/src/com/dima/tkswidget/WidgetController.java
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	taskwidget/src/com/dima/tkswidget/TaskWidgetProvider.java
	taskwidget/src/com/dima/tkswidget/WidgetController.java