Test
Merge branch 'Oscar' of https://github.com/oscargerbert/devgui-WeWhoLikePandas into Oscar

Conflicts:
	src/view/MainCalendarView.java
merge conflict solved