format
Merge remote-tracking branch 'origin/master' into feature-8-garden-sync

Conflicts:
	src/org/gots/seed/providers/nuxeo/NuxeoSeedProvider.java
temp