standalone!
standalone!
Merge branch 'master' into v2.x

Conflicts:
	PlantView/war/applet/plantview.signed.jar
standalone!