deleted missing reference from import
Merge remote-tracking branch 'origin/ribbons' into ribbons

Conflicts:
	freeplane/src/org/freeplane/core/ui/ribbon/RibbonBuilder.java
merged and refactored potential NPE