Feature 20 initial
Removed new code
Feature 22 initial
Merge branch 'feature/22' into dev
Merge branch 'feature/20' into dev

Conflicts:
	Source1/GitFlow.cpp