Update doc
Merge branch 'master' of https://github.com/slipstream/SlipStreamParent

Conflicts:
	README.md