GH221 - relations with no type yet
GH221- relations with labels from descriptors
Merge branch 'master' of https://github.com/flower-platform/main.git
GH221 - modifying properties for model, passes through DESS now
GH221 - Merge branch 'master' of
https://github.com/flower-platform/main.git

Conflicts:
	org.flowerplatform.codesync.code.java/src/com/crispico/flower/mp/codesync/code/java/CodeSyncCodeJavaPlugin.java
	org.flowerplatform.codesync/flex_src/org/flowerplatform/codesync/CodeSyncPlugin.as
Merge branch 'master' of https://github.com/flower-platform/main.git