Yep - committing and renaming some more documentation.
Merge branch 'master' of https://github.com/UCHIC/ODM2

Conflicts:
	doc/ODM2Docs/readme.md
	doc/ODM2Docs/samplingfeatures.md