#116 - download
#116 - Merge remote-tracking branch 'origin/master' into
GH116-download-upload

Conflicts:
	org.flowerplatform.core/public-resources/images/icons.txt
	org.flowerplatform.core/public-resources/messages.properties
	org.flowerplatform.core/src/org/flowerplatform/core/file/FilePropertiesProvider.java
	org.flowerplatform.flex_client.core/.flexLibProperties
	org.flowerplatform.flex_client.core/src/org/flowerplatform/flex_client/core/CorePlugin.as
	org.flowerplatform.freeplane/src/org/flowerplatform/freeplane/controller/FreeplaneIsSubscribablePropertyProvider.java
	org.flowerplatform.freeplane/src/org/flowerplatform/freeplane/controller/MindMapFileContentTypeProvider.java
#116 - upload
Merge remote-tracking branch 'origin/master' into GH116-download-upload
Merge pull request #187 from flower-platform/GH116-download-upload

#116 download upload