javadoc
Merge branch 'master' of https://github.com/javahacks/workbench.git

Conflicts:
	org.eclipse.emf.edit.ui.addon/src/org/eclipse/emf/edit/ui/addon/PartitionedContentProvider.java