Cutting edge feature 6
More changes to feature 6
Merge branch 'Feature6' into dev

Conflicts:
	README.md - resolved