refactored
Merge branch 'master' of https://github.com/m-lange/eclipse.git

Conflicts:
	eu.martinlange.launchpad/plugin.xml
	eu.martinlange.launchpad/src/eu/martinlange/launchpad/Plugin.java
	eu.martinlange.launchpad/src/eu/martinlange/launchpad/commands/LaunchCommandHandler.java
	eu.martinlange.launchpad/src/eu/martinlange/launchpad/internal/ConfigurationAdapterFactory.java
	eu.martinlange.launchpad/src/eu/martinlange/launchpad/model/FolderContentProvider.java
	eu.martinlange.launchpad/src/eu/martinlange/launchpad/ui/dialogs/MoveDialog.java
	eu.martinlange.launchpad/src/eu/martinlange/launchpad/ui/dialogs/NewDialog.java
	eu.martinlange.launchpad/src/eu/martinlange/launchpad/ui/dialogs/RenameDialog.java
	eu.martinlange.launchpad/src/eu/martinlange/launchpad/ui/views/LaunchpadContentProvider.java
	eu.martinlange.launchpad/src/eu/martinlange/launchpad/ui/views/LaunchpadLabelProvider.java
	eu.martinlange.launchpad/src/eu/martinlange/launchpad/ui/views/LaunchpadPart.java