#361 - Legend Node
git stagging design
Merge remote-tracking branch 'origin/master_git' into GH371-git-staging

Conflicts:
	org.flowerplatform.flex_client.codesync.sdiff/.actionScriptProperties
	org.flowerplatform.flex_client.codesync.sdiff/.flexLibProperties
	org.flowerplatform.product/eclipse-4.3.2.target
	org.flowerplatform.team.git/META-INF/MANIFEST.MF
	org.flowerplatform.team.git/src/org/flowerplatform/team/git/GitService.java
Finished the view for reset command
Added reset method in GitService.java
Modified parameters in GitService
GitService changes
Finished ResetView
Changes on the view
#376 - Merge remote-tracking branch 'origin/master_git' into GH376-reset

Conflicts:
	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/GitConstants.java
	org.flowerplatform.team.git/src/org/flowerplatform/team/git/GitService.java
#376 - Change GitService.reset() parameters
#GH376 - Add an Alert when the input String is not valid
GH372-configure-branch design
#GH363 - Custom markers for sdiff
#376 - Merge remote-tracking branch 'origin/master' into GH376-reset

Conflicts:
	org.flowerplatform.flex_client.resources/src/org/flowerplatform/flex_client/resources/Resources.as
Fixes problem after merge with master
GH361 - Path + Legend
Merge remote-tracking branch 'origin/master' into
GH361-graphical-improvements

Conflicts:
	org.flowerplatform.codesync.sdiff/src/org/flowerplatform/codesync/sdiff/StructureDiffService.java
	org.flowerplatform.resources/public-resources/messages/org_flowerplatform_resources.properties
GH363-custom-markers-for-sdiff
Use the getRepository method