some dependency juggling
Merge branch 'master' of git@github.com:sbarton933/scrum.git

Conflicts:
	org.eclipse.scrum.product/client.product