Merge branch 'story/some-story/68205904' into develop
Added commit/

Story-id: 68205904
Merge branch 'develop' of github.com:realyze/test-gitflow-2 into develop

Conflicts:
	foo.txt