#375 merge-branch-review
#375 - Merge remote-tracking branch 'origin/GH375-merge-branch-review'

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/GitConstants.as
	org.flowerplatform.flex_client.team.git/src/org/flowerplatform/flex_client/team/git/GitPlugin.as
	org.flowerplatform.flex_client.team.git/src/org/flowerplatform/flex_client/team/git/action/MergeBranchAction.as
	org.flowerplatform.team.git/src/org/flowerplatform/team/git/GitUtils.java
#375 - final corrections after review
Merge remote-tracking branch 'origin/master'