Merge origin/master

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

Conflicts:
	nbproject/project.properties