#71 - code review done
Merge remote-tracking branch 'origin/master' into GH71-categories-review

Conflicts:
	org.flowerplatform.codesync/src/org/flowerplatform/codesync/CodeSyncPlugin.java
	org.flowerplatform.flex_client.properties/src/org/flowerplatform/flex_client/properties/property_renderer/DropDownListPropertyRenderer.as
Merge remote-tracking branch 'origin/GH71-categories-review'