Merge origin/master

Conflicts:
	src/gourmand/util/MyConnection.java
Merge origin/master
Merge origin/master

Conflicts:
	src/gourmand/util/MyConnection.java
Merge origin/master

Conflicts:
	src/gourmand/util/MyConnection.java
Merge origin/master