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

Conflicts:
	Source1/GitFlow.cpp
Merge branch 'release/S2.0'