Merge branch 'widget_work_1'

Conflicts:
	app/src/main/java/com/example/tasker2/app/WidgetProvider.java