SlipStreamParent -> SlipStream
Merge branch 'master' of github.com:slipstream/SlipStreamDocumentation

Conflicts:
	pom.xml