GH383 - Merge remote-tracking branch 'origin/GH383-configure-branch'
into master_git

Conflicts:
	org.flowerplatform.flex_client.codesync.sdiff/.flexLibProperties
	org.flowerplatform.flex_client.team.git/.flexLibProperties
	org.flowerplatform.flex_client.team.git/src/org/flowerplatform/flex_client/team/git/GitConstants.as
	org.flowerplatform.flex_client.team.git/src/org/flowerplatform/flex_client/team/git/GitPlugin.as
	org.flowerplatform.resources/public-resources/messages/org_flowerplatform_resources.properties
	org.flowerplatform.team.git/src/org/flowerplatform/team/git/GitService.java