Fixed release
Turns out farting was too course a solution
Merge branch 'Ver_1_maintenance' into dev
Cutting edge feature 6
Feature 7 initial changes
Updated version info
More changes to feature 6
Merge branch 'Feature6' into dev

Conflicts:
	README.md - resolved
Fixed version number