devel 1 branch change #2
Merge branch 'developer2_dev'

Conflicts:
	branch_test.txt
changes on developer 2 branch