Merge branch 'dev' into stage
1234
Merge branch 'dev' into stage

Conflicts:
	test.txt
fixed
Merge branch 'hotfix' into stage
test
Merge branch 'stage' into dev