Merge origin/master

Conflicts:
	src/homesoil/HomeSoilPlugin.java