using new diagrams for object diagrams
js drawing shows icons now.
Merge remote-tracking branch 'origin/master' into javascriptDiagrams
exported sdmlib code style
extended xml reader for another EMF dialect
Merge branch 'master' into javascriptDiagrams

Conflicts:
	SDMLibEMF/emfsrc/org/sdmlib/serialization/xml/EmfIdMap.java
enhanced story pattern execution