Merge origin/master

Conflicts:
	nbproject/project.properties
	src/melt/Main.java
	src/melt/Question.java
	src/melt/QuestionDAO.java