Merge origin/master

Conflicts:
	nbproject/project.properties
	src/melt/EditQuestion.java
	src/melt/View/AddQuestion.java
	src/melt/startupPanel.form
	src/melt/startupPanel.java
Merge origin/master

Conflicts:
	src/melt/View/AddQuestion.java
	src/melt/View/StartupPanel.java