calendar
Merge branch 'master' of https://github.com/mariusciziunas/organizer

Conflicts:
	Organizer/src/main/java/com/beksta/organizer/gui/TasksEditor.java