#526 need to generate sdiff
#GH526 noteIcon & tooltip
#526 - Small corrections and merge remote-tracking branch
'origin/GH526-BaseRenderer-noteIcon&tooltip' into GH476-properties-cs2

Conflicts:
	org.flowerplatform.flexdiagram.samples.web/src/MindMapSamplesWeb.mxml
	org.flowerplatform.flexdiagram.samples/src/org/flowerplatform/flexdiagram/samples/mindmap/SampleMindMapDiagramShell.as
	org.flowerplatform.flexdiagram/src/org/flowerplatform/flexdiagram/renderer/BaseRenderer.as
	org.flowerplatform.mindmap/src/org/flowerplatform/mindmap/MindMapConstants.java