Merge origin/master

Conflicts:
	src/nl/inkoop/business/NutrientManager.java