line-endings
fixed version problem for workspace import
modified import wizard

-added checkbox for deleting old settings on convert
-added service options to second setup page
line-endings
fixed error when retrieving workspace root node children
Merge branch 'freeplane_master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
docear workspace bugfix: do not add a project twice
copy "My New Paper.mm" into standard library path
Merge remote-tracking branch 'origin/master' into ribbons

Conflicts:
	docear_plugin_bibtex/resources/translations/Resources_en.properties
	docear_plugin_bibtex/src/org/docear/plugin/bibtex/ReferencesController.java
	docear_plugin_bibtex/src/org/docear/plugin/bibtex/actions/ChangeBibtexDatabaseAction.java
	docear_plugin_core/src/org/docear/plugin/core/IBibtexDatabase.java
	docear_plugin_core/src/org/docear/plugin/core/workspace/node/LinkTypeReferencesNode.java
	freeplane/viewer-resources/freeplane.properties