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

Conflicts:
	eu.martinlange.launchpad/src/eu/martinlange/launchpad/views/ChangeLaunchModeAction.java
	eu.martinlange.launchpad/src/eu/martinlange/launchpad/views/ChangeRootModeAction.java
	eu.martinlange.launchpad/src/eu/martinlange/launchpad/views/CollapseAllAction.java
	eu.martinlange.launchpad/src/eu/martinlange/launchpad/views/LaunchpadActionGroup.java
	eu.martinlange.launchpad/src/eu/martinlange/launchpad/views/LaunchpadView.java