Merge origin/master

Conflicts:
	src/melt/Main.java
	src/melt/Model/FIB.java
	src/melt/View/AddQuestion.java
	src/melt/View/StartupPanel.java
Merge origin/master

Conflicts:
	src/melt/Main.java
	src/melt/Model/FIB.java
	src/melt/View/AddQuestion.java
	src/melt/View/StartupPanel.java