Support two languages
Merge branch 'Andrea' of https://github.com/oscargerbert/devgui-WeWhoLikePandas into Andrea
support for two languages
Merge branch 'Oscar' into Andrea

Conflicts:
	src/view/MainView.java
	src/view/MenuBar.java
	src/view/OngoingEventView.java