#365 - Initial commit
Merge remote-tracking branch 'origin/GH365-sdiff-from-git'

Conflicts:
	org.flowerplatform.flex_client.team.git/.gitignore