remove options show_note_icons and show_icon_for_attributes from preferences,
they should be set in the template maps
Merge branch '1.3.x'

Conflicts:
	freeplane/resources/xml/preferences.mm