Added f3.cpp
Bug fix 1
Bug fix 2
Added new function
Bug fix 3 added
Merge branch 'Features/f3' into dev

Conflicts:
	Source1/GitFlow.cpp
Merge branch 'releases/r1beta' into dev