#70 - just started
#70 - before checkout
#70 - intermediate commit
Merge remote-tracking branch 'origin/master' into
GH70-improvement-using-a-layout-instead-of-the-data-group

Conflicts:
	org.flowerplatform.codesync/src/org/flowerplatform/codesync/CodeSyncPlugin.java
	org.flowerplatform.flex_client.properties/.flexLibProperties
	org.flowerplatform.flex_client.properties/src/org/flowerplatform/flex_client/properties/PropertiesView.mxml
	org.flowerplatform.flex_client.properties/src/org/flowerplatform/flex_client/properties/PropertyItemRenderer.mxml
	org.flowerplatform.flex_client.properties/src/org/flowerplatform/flex_client/properties/property_renderer/BasicPropertyRenderer.as
	org.flowerplatform.flex_client.properties/src/org/flowerplatform/flex_client/properties/property_renderer/DropDownListPropertyRenderer.as
#70 - layout instead of data grid, numeric field with stepper added
#71 - categories
#71 - Merge remote-tracking branch 'origin/GH71-categories'

Conflicts:
	org.flowerplatform.util/src/org/flowerplatform/util/servlet/PublicResourcesServlet.java
	org.flowerplatform.util/src/org/flowerplatform/util/servlet/ResourcesServlet.java
Merge remote-tracking branch 'origin/master'