Merge origin/master

Conflicts:
	src/melt/startupPanel.java
Merge origin/master

Conflicts:
	src/melt/Main.java
	src/melt/Util/jdbc.properties