merge
1988]: conditional styles don't work
Merge branch '1.2.x' of git://github.com/freeplane/freeplane into 1.2.x
Merge branch '1.2.x' into 1.2.x.classpath
Merge branch '1.2.x.classpath' into 1.2.x.custom