manifest i global manifest
Merge branch 'feature/1' into develop

Conflicts:
	first_develop_file.txt