f3-only
f3-only
Merge branch 'feature/3' of https://github.com/aleksandaroj/qa into feature/3

Conflicts:
	first_develop_file.txt
	global_manifest.txt
	manifest.txt
Merge branch 'feature/3' into develop