#191 - JSON API samples
Merge remote-tracking branch 'origin/master' into GH193-users-analysis

Conflicts:
	org.flowerplatform.flex_client.web/src/org/flowerplatform/flex_client/web/WebPlugin.as
#191 - Users list sample
#193 - Fix for background JS login
#193 - Fix for background JS login
Merge with master
#193 - Fix class loading problem
Merge remote-tracking branch 'origin/GH193-users-analysis' into GH193-users-analysis
#193 - Moved UserService, JS app with AngularJS (intermediate)
#193 - Remove old js app
#193 - Merge remote-tracking branch 'origin/master' into
GH193-users-analysis

Conflicts:
	org.flowerplatform.core/src/org/flowerplatform/core/CorePlugin.java
	org.flowerplatform.core/src/org/flowerplatform/core/CoreService.java
	org.flowerplatform.core/src/org/flowerplatform/core/RemoteMethodInvocationListener.java
	org.flowerplatform.flex_client.codesync.sdiff/.actionScriptProperties
	org.flowerplatform.flex_client.resources/src/org/flowerplatform/flex_client/resources/Resources.as
	org.flowerplatform.flex_client.team.git/.actionScriptProperties
	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/CloneRepoAction.as
	org.flowerplatform.flex_client.team.git/src/org/flowerplatform/flex_client/team/git/action/DeleteBranchAction.as
	org.flowerplatform.flex_client.team.git/src/org/flowerplatform/flex_client/team/git/remote/GitRef.as
	org.flowerplatform.flex_client.team.git/src/org/flowerplatform/flex_client/team/git/ui/CloneRepoWizardView.mxml
	org.flowerplatform.flex_client.team.git/src/org/flowerplatform/flex_client/team/git/ui/component/SelectRepositoryComponent.mxml
	org.flowerplatform.flex_client.web/src/org/flowerplatform/flex_client/web/WebPlugin.as
	org.flowerplatform.product/flowerplatform.product
	org.flowerplatform.resources/public-resources/messages/org_flowerplatform_resources.properties
	org.flowerplatform.team.git/.classpath
	org.flowerplatform.team.git/.project
	org.flowerplatform.team.git/META-INF/MANIFEST.MF
	org.flowerplatform.team.git/build.properties
	org.flowerplatform.team.git/pom.xml
	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
	org.flowerplatform.team.git/src/org/flowerplatform/team/git/remote/GitRef.java
	org.flowerplatform.util/.classpath
	org.flowerplatform.util/META-INF/MANIFEST.MF
	org.flowerplatform.util/build.properties
	org.flowerplatform.util/lib-from-maven-pom.xml
#193 - fix some issues after merge
#193 - added stage view library
#193 - added some comments
#193 - Merge remote-tracking branch 'origin/master' into
GH193-users-analysis

Conflicts:
	org.flowerplatform.flex_client.codesync.sdiff/.actionScriptProperties
	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/action/CloneRepoAction.as
	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
GH471-GH470 Layout,Menu,Users
Merge branch 'GH193-users-analysis' of https://github.com/flower-platform/flower-platform-4.git into GH471-GH470-Layout-Menu-Users
#346 - partial java implementation + flex corrections
GH471-GH470  Layout, Menu, Users - first version
#193 - Actibate JAXB annotations for Jackson