merge
Merge branch 'master' of https://github.com/abes140377/sam-app

Conflicts:
	plugins/de.freund.sam.project.ui/META-INF/MANIFEST.MF
	plugins/de.freund.sam.project.ui/src/de/freund/sam/project/ui/view/ProjectNavigationView.java
a
rcpforms wieder raus