finalize git staging
Merge remote-tracking branch 'origin/GH371-git-staging' into
GH371-git-staging

Conflicts:
	org.flowerplatform.flex_client.team.git/src/org/flowerplatform/flex_client/team/git/GitStagingDialog.mxml