test commit
User migration - partial implementation
Intermediate commit
Merge remote-tracking branch 'origin/master' into users
Merge remote-tracking branch 'origin/master' into users
Intermediate commit - contains compilation errors
Intermediate commit - contains compilation errors
Partial commit
Merge remote-tracking branch 'origin/master' into users

Conflicts:
	org.flowerplatform.blazeds/META-INF/MANIFEST.MF
	org.flowerplatform.communication/plugin.xml
	org.flowerplatform.editor/META-INF/MANIFEST.MF
	org.flowerplatform.web.common/src/org/flowerplatform/web/common/WebCommonPlugin.as
	org.flowerplatform.web/META-INF/MANIFEST.MF
	org.flowerplatform.web/flex_src/org/flowerplatform/web/WebPlugin.as
	org.flowerplatform.web/launch_configs/Flower Platform - Web.launch
	org.flowerplatform.web/plugin.xml