#381 - Merge remote-tracking branch 'origin/GH381-rename-branch' into
master_git

Conflicts:
	org.flowerplatform.flex_client.codesync.sdiff/.flexLibProperties
	org.flowerplatform.flex_client.resources/src/org/flowerplatform/flex_client/resources/Resources.as
	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.team.git/src/org/flowerplatform/team/git/GitService.java
#381 - Rename Branch version 1

Conflicts:
	org.flowerplatform.flex_client.resources/src/org/flowerplatform/flex_client/resources/Resources.as
	org.flowerplatform.flex_client.team.git/src/org/flowerplatform/flex_client/team/git/GitPlugin.as
	org.flowerplatform.team.git/src/org/flowerplatform/team/git/GitPlugin.java
	org.flowerplatform.team.git/src/org/flowerplatform/team/git/GitService.java
Rename Branch - version 1
#381 - Rename Branch

Conflicts:
	org.flowerplatform.flex_client.team.git/src/org/flowerplatform/flex_client/team/git/GitConstants.as
#381 - Rename Branch

Conflicts:
	org.flowerplatform.team.git/src/org/flowerplatform/team/git/GitPlugin.java
	org.flowerplatform.team.git/src/org/flowerplatform/team/git/GitService.java