fitte
Merge branch 'master' of https://github.com/kristhus/Calendar

Conflicts:
	Calendar/src/visual/MainFrame.java