Merge remote-tracking branch 'origin/GH395-git-history-copy-id' into
GH384-checkout-review

Conflicts:
	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.flex_client.team.git/src/org/flowerplatform/flex_client/team/git/action/MergeAction.as
	org.flowerplatform.flex_client.team.git/src/org/flowerplatform/flex_client/team/git/action/history/ui/GitHistoryView.mxml
	org.flowerplatform.resources/public-resources/messages/org_flowerplatform_resources.properties
	org.flowerplatform.team.git/src/org/flowerplatform/team/git/GitConstants.java
	org.flowerplatform.team.git/src/org/flowerplatform/team/git/GitPlugin.java
	org.flowerplatform.team.git/src/org/flowerplatform/team/git/GitService.java
#GH396 - Git History: Checkout
#GH401 - Git History: Reset
Merge remote-tracking branch 'origin/master' into
GH401-git-history-reset

Conflicts:
	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.flex_client.team.git/src/org/flowerplatform/flex_client/team/git/action/MergeAction.as
	org.flowerplatform.flex_client.team.git/src/org/flowerplatform/flex_client/team/git/action/history/ui/GitHistoryView.mxml
	org.flowerplatform.resources/public-resources/messages/org_flowerplatform_resources.properties
	org.flowerplatform.team.git/src/org/flowerplatform/team/git/GitConstants.java
	org.flowerplatform.team.git/src/org/flowerplatform/team/git/GitPlugin.java
	org.flowerplatform.team.git/src/org/flowerplatform/team/git/GitService.java
#401 - Merge remote-tracking branch 'origin/GH401-git-history-reset'

Conflicts:
	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/GitPlugin.as
	org.flowerplatform.flex_client.team.git/src/org/flowerplatform/flex_client/team/git/action/MergeAction.as
	org.flowerplatform.flex_client.team.git/src/org/flowerplatform/flex_client/team/git/action/history/ui/GitHistoryView.mxml
	org.flowerplatform.resources/public-resources/messages/org_flowerplatform_resources.properties
	org.flowerplatform.team.git/src/org/flowerplatform/team/git/GitConstants.java
	org.flowerplatform.team.git/src/org/flowerplatform/team/git/GitPlugin.java